Relocate display_manager from ash to ui

Relocate display_manager from ash to ui

Move display_manager from ash to ui so that it can be used in mus and in
ash.

BUG=581462
Committed: https://crrev.com/72f8154f53caca49e8cd703d36c5d9e66e33f338
Cr-Commit-Position: refs/heads/master@{#428567}

[rjkroege, 2016-10-23 01:34:34]

rjkroege@chromium.org changed reviewers:
+ oshima@chromium.org

[rjkroege, 2016-10-23 01:34:35]

ptal.

[kylechar, 2016-10-24 14:55:14]

kylechar@chromium.org changed reviewers:
+ kylechar@chromium.org

[kylechar, 2016-10-24 14:55:15]

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
File ash/display/extended_mouse_warp_controller.h (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
ash/display/extended_mouse_warp_controller.h:23: // namespace test {
Delete?

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
ash/display/extended_mouse_warp_controller.h:50: // friend class
display::test::DisplayManagerTestApi;
Delete?

https://codereview.chromium.org/2445583002/diff/1/ash/display/mirror_window_c...
File ash/display/mirror_window_controller.h (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/mirror_window_c...
ash/display/mirror_window_controller.h:33: class DisplayManager;
The forward def isn't needed with the include.

https://codereview.chromium.org/2445583002/diff/1/ash/display/mouse_cursor_ev...
File ash/display/mouse_cursor_event_filter.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/mouse_cursor_ev...
ash/display/mouse_cursor_event_filter.cc:10: //#include
"ui/display/manager/display_manager.h"
Delete?

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
File ash/utility/screenshot_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
ash/utility/screenshot_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
Is this needed or should it be ui/display/manager/display_manager.h instead?

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
File chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
(right):

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc:30:
#include "ui/display/manager/display_manager.h"
Is DisplayManager used here?

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
File ui/display/manager/display_manager.h (right):

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
ui/display/manager/display_manager.h:50: // TODO(oshima): Make this non
internal.
TODO is fulfilled.

[oshima, 2016-10-24 19:29:16]

lgtm with nits

https://codereview.chromium.org/2445583002/diff/1/ash/accelerators/accelerato...
File ash/accelerators/accelerator_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/accelerators/accelerato...
ash/accelerators/accelerator_controller_unittest.cc:37: #include
"ui/display/test/display_manager_test_api.h"
nit: Looks like this is obsolete.

https://codereview.chromium.org/2445583002/diff/1/ash/display/display_util_un...
File ash/display/display_util_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/display_util_un...
ash/display/display_util_unittest.cc:10: #include
"ui/display/test/display_manager_test_api.h"
This isn't used?

https://codereview.chromium.org/2445583002/diff/1/ash/display/unified_mouse_w...
File ash/display/unified_mouse_warp_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/unified_mouse_w...
ash/display/unified_mouse_warp_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/ash/root_window_controller_...
File ash/root_window_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/root_window_controller_...
ash/root_window_controller_unittest.cc:40: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/ash/screen_util_unittest.cc
File ash/screen_util_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/screen_util_unittest.cc...
ash/screen_util_unittest.cc:17: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/ash/system/chromeos/screen_...
File ash/system/chromeos/screen_layout_observer_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/system/chromeos/screen_...
ash/system/chromeos/screen_layout_observer_unittest.cc:20: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
File ash/utility/screenshot_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
ash/utility/screenshot_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 14:55:15, kylechar wrote:
> Is this needed or should it be ui/display/manager/display_manager.h instead?

You don't need the definition of DisplayManager to use TestAPI,
although this include seems to be obsolete.

https://codereview.chromium.org/2445583002/diff/1/ash/wm/drag_window_resizer_...
File ash/wm/drag_window_resizer_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/wm/drag_window_resizer_...
ash/wm/drag_window_resizer_unittest.cc:31: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/ash/wm/workspace/workspace_...
File ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/wm/workspace/workspace_...
ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc:33: #include
"ui/display/test/display_manager_test_api.h"
ditto

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
File chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
(right):

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc:30:
#include "ui/display/manager/display_manager.h"
On 2016/10/24 14:55:15, kylechar wrote:
> Is DisplayManager used here?

looks like these are no longer used.

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
File ui/display/manager/display_manager.h (right):

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
ui/display/manager/display_manager.h:50: // TODO(oshima): Make this non
internal.
On 2016/10/24 14:55:15, kylechar wrote:
> TODO is fulfilled.

yes :)

[oshima, 2016-10-25 18:38:29]

can you hold this a bit? we may want to merge this CL
(https://codereview.chromium.org/2426103004) back to 55, so it should be landed
first.

thanks

[oshima, 2016-10-25 18:41:06]

can you hold this a bit? we may want to merge this CL
(https://codereview.chromium.org/2426103004) back to 55, so it should be landed
first.

thanks

[rjkroege, 2016-10-25 23:30:24]

rjkroege@chromium.org changed reviewers:
+ reveman@chromium.org, sky@chromium.org

[rjkroege, 2016-10-25 23:30:26]

oshima@: happy to wait until other CL is landed.

OWNERS approval please:
sky@: chrome/*
reveman@: components/exo/*

https://codereview.chromium.org/2445583002/diff/1/ash/accelerators/accelerato...
File ash/accelerators/accelerator_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/accelerators/accelerato...
ash/accelerators/accelerator_controller_unittest.cc:37: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> nit: Looks like this is obsolete.

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/display_util_un...
File ash/display/display_util_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/display_util_un...
ash/display/display_util_unittest.cc:10: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> This isn't used?

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
File ash/display/extended_mouse_warp_controller.h (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
ash/display/extended_mouse_warp_controller.h:23: // namespace test {
On 2016/10/24 14:55:15, kylechar wrote:
> Delete?

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/extended_mouse_...
ash/display/extended_mouse_warp_controller.h:50: // friend class
display::test::DisplayManagerTestApi;
On 2016/10/24 14:55:15, kylechar wrote:
> Delete?

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/mirror_window_c...
File ash/display/mirror_window_controller.h (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/mirror_window_c...
ash/display/mirror_window_controller.h:33: class DisplayManager;
On 2016/10/24 14:55:15, kylechar wrote:
> The forward def isn't needed with the include.

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/mouse_cursor_ev...
File ash/display/mouse_cursor_event_filter.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/mouse_cursor_ev...
ash/display/mouse_cursor_event_filter.cc:10: //#include
"ui/display/manager/display_manager.h"
On 2016/10/24 14:55:15, kylechar wrote:
> Delete?

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/display/unified_mouse_w...
File ash/display/unified_mouse_warp_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/display/unified_mouse_w...
ash/display/unified_mouse_warp_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/root_window_controller_...
File ash/root_window_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/root_window_controller_...
ash/root_window_controller_unittest.cc:40: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/screen_util_unittest.cc
File ash/screen_util_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/screen_util_unittest.cc...
ash/screen_util_unittest.cc:17: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/system/chromeos/screen_...
File ash/system/chromeos/screen_layout_observer_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/system/chromeos/screen_...
ash/system/chromeos/screen_layout_observer_unittest.cc:20: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
File ash/utility/screenshot_controller_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
ash/utility/screenshot_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> On 2016/10/24 14:55:15, kylechar wrote:
> > Is this needed or should it be ui/display/manager/display_manager.h instead?
> 
> You don't need the definition of DisplayManager to use TestAPI,
> although this include seems to be obsolete.

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/utility/screenshot_cont...
ash/utility/screenshot_controller_unittest.cc:19: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 14:55:15, kylechar wrote:
> Is this needed or should it be ui/display/manager/display_manager.h instead?

not needed. Done.

https://codereview.chromium.org/2445583002/diff/1/ash/wm/drag_window_resizer_...
File ash/wm/drag_window_resizer_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/wm/drag_window_resizer_...
ash/wm/drag_window_resizer_unittest.cc:31: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/ash/wm/workspace/workspace_...
File ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc (right):

https://codereview.chromium.org/2445583002/diff/1/ash/wm/workspace/workspace_...
ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc:33: #include
"ui/display/test/display_manager_test_api.h"
On 2016/10/24 19:29:16, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
File chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
(right):

https://codereview.chromium.org/2445583002/diff/1/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc:30:
#include "ui/display/manager/display_manager.h"
On 2016/10/24 14:55:15, kylechar wrote:
> Is DisplayManager used here?

Done. Both removed.

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
File ui/display/manager/display_manager.h (right):

https://codereview.chromium.org/2445583002/diff/1/ui/display/manager/display_...
ui/display/manager/display_manager.h:50: // TODO(oshima): Make this non
internal.
On 2016/10/24 19:29:16, oshima wrote:
> On 2016/10/24 14:55:15, kylechar wrote:
> > TODO is fulfilled.
> 
> yes :)

Done! :-)

[rjkroege, 2016-10-25 23:31:57]

rjkroege@chromium.org changed reviewers:
+ stevenjb@chromium.org

[rjkroege, 2016-10-25 23:31:58]

more owners review please:

stevenjb@ for chrome/browser/ui/webui/options/*

[stevenjb, 2016-10-25 23:37:08]

RS owner lgtm

[sky, 2016-10-25 23:53:55]

LGTM

[rjkroege, 2016-10-26 00:12:34]

The CQ bit was checked by rjkroege@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-26 00:12:52]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-26 00:20:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-26 00:20:15]

Dry run: Try jobs failed on following builders:
  cast_shell_linux on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linu...)
  linux_chromium_chromeos_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[reveman, 2016-10-26 00:59:13]

components/exo lgtm

[kylechar, 2016-10-26 14:59:47]

lgtm

[rjkroege, 2016-10-26 20:48:28]

The CQ bit was checked by rjkroege@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-26 20:49:23]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-26 20:58:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-26 20:58:23]

Dry run: Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[oshima, 2016-10-26 20:58:41]

lgtm

[rjkroege, 2016-10-27 17:36:48]

The CQ bit was checked by rjkroege@chromium.org

[rjkroege, 2016-10-27 17:36:49]

The patchset sent to the CQ was uploaded after l-g-t-m from
reveman@chromium.org, kylechar@chromium.org, sky@chromium.org,
stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2445583002/#ps40001
(title: "fix gn gen --check")

[commit-bot: I haz the power, 2016-10-27 17:37:13]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-27 17:42:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-27 17:42:54]

Try jobs failed on following builders:
  chromeos_amd64-generic_chromium_compile_only_ng on
master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-...)
  chromeos_daisy_chromium_compile_only_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)
  chromeos_x86-generic_chromium_compile_only_ng on
master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_x86-ge...)
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
  linux_chromium_clobber_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[rjkroege, 2016-10-27 21:33:32]

Patchset #4 (id:60001) has been deleted

[rjkroege, 2016-10-27 21:35:37]

The CQ bit was checked by rjkroege@chromium.org

[rjkroege, 2016-10-27 21:35:37]

The patchset sent to the CQ was uploaded after l-g-t-m from
reveman@chromium.org, kylechar@chromium.org, oshima@chromium.org,
sky@chromium.org, stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2445583002/#ps80001
(title: "rebased")

[commit-bot: I haz the power, 2016-10-27 21:36:36]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-27 22:23:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-27 22:23:39]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[rjkroege, 2016-10-28 00:14:51]

The CQ bit was checked by rjkroege@chromium.org

[rjkroege, 2016-10-28 00:14:52]

The patchset sent to the CQ was uploaded after l-g-t-m from
reveman@chromium.org, kylechar@chromium.org, oshima@chromium.org,
sky@chromium.org, stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2445583002/#ps100001
(title: "fix windows build")

[commit-bot: I haz the power, 2016-10-28 00:15:22]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-28 01:02:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-28 01:02:36]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[rjkroege, 2016-10-28 23:11:48]

The CQ bit was checked by rjkroege@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-28 23:12:24]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-29 00:40:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-29 00:40:31]

Dry run: This issue passed the CQ dry run.

[rjkroege, 2016-10-29 00:40:49]

The CQ bit was checked by rjkroege@chromium.org

[rjkroege, 2016-10-29 00:40:49]

The patchset sent to the CQ was uploaded after l-g-t-m from
reveman@chromium.org, kylechar@chromium.org, oshima@chromium.org,
sky@chromium.org, stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2445583002/#ps120001
(title: "fix windows build")

[commit-bot: I haz the power, 2016-10-29 00:41:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-29 00:49:54]

Committed patchset #6 (id:120001)

[commit-bot: I haz the power, 2016-10-29 00:52:46]

Description was changed from

==========
Relocate display_manager from ash to ui

Move display_manager from ash to ui so that it can be used in mus and in
ash.

BUG=581462
==========

to

==========
Relocate display_manager from ash to ui

Move display_manager from ash to ui so that it can be used in mus and in
ash.

BUG=581462

Committed: https://crrev.com/72f8154f53caca49e8cd703d36c5d9e66e33f338
Cr-Commit-Position: refs/heads/master@{#428567}
==========

[commit-bot: I haz the power, 2016-10-29 00:52:48]

Patchset 6 (id:??) landed as
https://crrev.com/72f8154f53caca49e8cd703d36c5d9e66e33f338
Cr-Commit-Position: refs/heads/master@{#428567}