browser_tests failing on chromium.mac/Mac10.10 Tests

Builders failed on: 
- Mac10.10 Tests: 
  https://build.chromium.org/p/chromium.mac/builders/Mac10.10%20Tests

2 tests failed:
DevToolsManagerDelegateTest.MaximizedToMinimizedWindow
DevToolsManagerDelegateTest.NormalToMinimizedWindow

Flaky test failure. The automatic revert does not work because the CL was landed 2 days ago. The conflict needs to be resolved manually.