BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

20 files changed, 633 insertions, 346 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 92e6f2f6e9d..14eb0f08073 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -78,6 +78,10 @@ component("ash") {
     "common/cast_config_delegate.h",
     "common/default_accessibility_delegate.cc",
     "common/default_accessibility_delegate.h",
+    "common/devtools/ash_devtools_css_agent.cc",
+    "common/devtools/ash_devtools_css_agent.h",
+    "common/devtools/ash_devtools_dom_agent.cc",
+    "common/devtools/ash_devtools_dom_agent.h",
     "common/drag_drop/drag_image_view.cc",
     "common/drag_drop/drag_image_view.h",
     "common/focus_cycler.cc",
@@ -120,6 +124,8 @@ component("ash") {
     "common/mojo_interface_factory.h",
     "common/multi_profile_uma.cc",
     "common/multi_profile_uma.h",
+    "common/new_window_client_proxy.cc",
+    "common/new_window_client_proxy.h",
     "common/palette_delegate.h",
     "common/popup_message.cc",
     "common/popup_message.h",
@@ -152,6 +158,8 @@ component("ash") {
     "common/shelf/shelf_button_pressed_metric_tracker.h",
     "common/shelf/shelf_constants.cc",
     "common/shelf/shelf_constants.h",
+    "common/shelf/shelf_controller.cc",
+    "common/shelf/shelf_controller.h",
     "common/shelf/shelf_delegate.h",
     "common/shelf/shelf_item_delegate.h",
     "common/shelf/shelf_item_types.cc",
@@ -181,24 +189,19 @@ component("ash") {
     "common/shelf/wm_shelf_util.cc",
     "common/shelf/wm_shelf_util.h",
     "common/shell_delegate.h",
-    "common/shell_window_ids.cc",
-    "common/shell_window_ids.h",
+    "common/shutdown_controller.cc",
+    "common/shutdown_controller.h",
     "common/system/accessibility_observer.h",
-    "common/system/audio/audio_observer.h",
-    "common/system/audio/tray_audio.cc",
-    "common/system/audio/tray_audio.h",
-    "common/system/audio/tray_audio_delegate.h",
-    "common/system/audio/volume_view.cc",
-    "common/system/audio/volume_view.h",
     "common/system/brightness_control_delegate.h",
-    "common/system/cast/tray_cast.cc",
-    "common/system/cast/tray_cast.h",
     "common/system/chromeos/audio/audio_detailed_view.cc",
     "common/system/chromeos/audio/audio_detailed_view.h",
-    "common/system/chromeos/audio/tray_audio_chromeos.cc",
-    "common/system/chromeos/audio/tray_audio_chromeos.h",
+    "common/system/chromeos/audio/tray_audio.cc",
+    "common/system/chromeos/audio/tray_audio.h",
+    "common/system/chromeos/audio/tray_audio_delegate.h",
     "common/system/chromeos/audio/tray_audio_delegate_chromeos.cc",
     "common/system/chromeos/audio/tray_audio_delegate_chromeos.h",
+    "common/system/chromeos/audio/volume_view.cc",
+    "common/system/chromeos/audio/volume_view.h",
     "common/system/chromeos/bluetooth/bluetooth_notification_controller.cc",
     "common/system/chromeos/bluetooth/bluetooth_notification_controller.h",
     "common/system/chromeos/bluetooth/bluetooth_observer.h",
@@ -208,6 +211,8 @@ component("ash") {
     "common/system/chromeos/brightness/brightness_controller_chromeos.h",
     "common/system/chromeos/brightness/tray_brightness.cc",
     "common/system/chromeos/brightness/tray_brightness.h",
+    "common/system/chromeos/cast/tray_cast.cc",
+    "common/system/chromeos/cast/tray_cast.h",
     "common/system/chromeos/devicetype_utils.cc",
     "common/system/chromeos/devicetype_utils.h",
     "common/system/chromeos/enterprise/enterprise_domain_observer.h",
@@ -223,6 +228,20 @@ component("ash") {
     "common/system/chromeos/media_security/multi_profile_media_tray_item.cc",
     "common/system/chromeos/media_security/multi_profile_media_tray_item.h",
     "common/system/chromeos/network/network_detailed_view.h",
+    "common/system/chromeos/network/network_icon.cc",
+    "common/system/chromeos/network/network_icon.h",
+    "common/system/chromeos/network/network_icon_animation.cc",
+    "common/system/chromeos/network/network_icon_animation.h",
+    "common/system/chromeos/network/network_icon_animation_observer.h",
+    "common/system/chromeos/network/network_info.cc",
+    "common/system/chromeos/network/network_info.h",
+    "common/system/chromeos/network/network_list.cc",
+    "common/system/chromeos/network/network_list.h",
+    "common/system/chromeos/network/network_list_delegate.h",
+    "common/system/chromeos/network/network_list_md.cc",
+    "common/system/chromeos/network/network_list_md.h",
+    "common/system/chromeos/network/network_list_view_base.cc",
+    "common/system/chromeos/network/network_list_view_base.h",
     "common/system/chromeos/network/network_observer.h",
     "common/system/chromeos/network/network_portal_detector_observer.h",
     "common/system/chromeos/network/network_state_list_detailed_view.cc",
@@ -292,7 +311,6 @@ component("ash") {
     "common/system/chromeos/session/tray_session_length_limit.h",
     "common/system/chromeos/settings/tray_settings.cc",
     "common/system/chromeos/settings/tray_settings.h",
-    "common/system/chromeos/shutdown_policy_observer.h",
     "common/system/chromeos/supervised/custodian_info_tray_observer.h",
     "common/system/chromeos/supervised/tray_supervised_user.cc",
     "common/system/chromeos/supervised/tray_supervised_user.h",
@@ -310,15 +328,18 @@ component("ash") {
     "common/system/date/date_default_view.h",
     "common/system/date/date_view.cc",
     "common/system/date/date_view.h",
+    "common/system/date/system_info_default_view.cc",
+    "common/system/date/system_info_default_view.h",
     "common/system/date/tray_date.cc",
     "common/system/date/tray_date.h",
+    "common/system/date/tray_system_info.cc",
+    "common/system/date/tray_system_info.h",
     "common/system/ime/ime_observer.h",
     "common/system/ime/tray_ime_chromeos.cc",
     "common/system/ime/tray_ime_chromeos.h",
     "common/system/keyboard_brightness_control_delegate.h",
     "common/system/locale/locale_notification_controller.cc",
     "common/system/locale/locale_notification_controller.h",
-    "common/system/locale/locale_observer.h",
     "common/system/networking_config_delegate.cc",
     "common/system/networking_config_delegate.h",
     "common/system/overview/overview_button_tray.cc",
@@ -355,6 +376,8 @@ component("ash") {
     "common/system/tray/ime_info.h",
     "common/system/tray/label_tray_view.cc",
     "common/system/tray/label_tray_view.h",
+    "common/system/tray/size_range_layout.cc",
+    "common/system/tray/size_range_layout.h",
     "common/system/tray/special_popup_row.cc",
     "common/system/tray/special_popup_row.h",
     "common/system/tray/system_menu_button.cc",
@@ -393,6 +416,7 @@ component("ash") {
     "common/system/tray/tray_notification_view.h",
     "common/system/tray/tray_popup_header_button.cc",
     "common/system/tray/tray_popup_header_button.h",
+    "common/system/tray/tray_popup_ink_drop_style.h",
     "common/system/tray/tray_popup_item_container.cc",
     "common/system/tray/tray_popup_item_container.h",
     "common/system/tray/tray_popup_item_style.cc",
@@ -401,8 +425,12 @@ component("ash") {
     "common/system/tray/tray_popup_label_button.h",
     "common/system/tray/tray_popup_label_button_border.cc",
     "common/system/tray/tray_popup_label_button_border.h",
+    "common/system/tray/tray_popup_utils.cc",
+    "common/system/tray/tray_popup_utils.h",
     "common/system/tray/tray_utils.cc",
     "common/system/tray/tray_utils.h",
+    "common/system/tray/tri_view.cc",
+    "common/system/tray/tri_view.h",
     "common/system/tray/view_click_listener.h",
     "common/system/tray_accessibility.cc",
     "common/system/tray_accessibility.h",
@@ -424,7 +452,6 @@ component("ash") {
     "common/system/user/user_observer.h",
     "common/system/user/user_view.cc",
     "common/system/user/user_view.h",
-    "common/system/volume_control_delegate.h",
     "common/system/web_notification/ash_popup_alignment_delegate.cc",
     "common/system/web_notification/ash_popup_alignment_delegate.h",
     "common/system/web_notification/web_notification_tray.cc",
@@ -494,6 +521,8 @@ component("ash") {
     "common/wm/overview/window_selector_controller.h",
     "common/wm/overview/window_selector_item.cc",
     "common/wm/overview/window_selector_item.h",
+    "common/wm/panels/panel_frame_view.cc",
+    "common/wm/panels/panel_frame_view.h",
     "common/wm/panels/panel_layout_manager.cc",
     "common/wm/panels/panel_layout_manager.h",
     "common/wm/panels/panel_window_resizer.cc",
@@ -593,8 +622,6 @@ component("ash") {
     "display/display_configuration_controller.h",
     "display/display_error_observer_chromeos.cc",
     "display/display_error_observer_chromeos.h",
-    "display/display_manager.cc",
-    "display/display_manager.h",
     "display/display_pref_util.h",
     "display/display_util.cc",
     "display/display_util.h",
@@ -711,6 +738,8 @@ component("ash") {
     "sticky_keys/sticky_keys_state.h",
     "system/chromeos/power/power_event_observer.cc",
     "system/chromeos/power/power_event_observer.h",
+    "system/chromeos/power/tablet_power_button_controller.cc",
+    "system/chromeos/power/tablet_power_button_controller.h",
     "system/chromeos/power/video_activity_notifier.cc",
     "system/chromeos/power/video_activity_notifier.h",
     "system/chromeos/rotation/tray_rotation_lock.cc",
@@ -771,8 +800,6 @@ component("ash") {
     "wm/overview/scoped_overview_animation_settings_factory_aura.h",
     "wm/panels/attached_panel_window_targeter.cc",
     "wm/panels/attached_panel_window_targeter.h",
-    "wm/panels/panel_frame_view.cc",
-    "wm/panels/panel_frame_view.h",
     "wm/panels/panel_window_event_handler.cc",
     "wm/panels/panel_window_event_handler.h",
     "wm/power_button_controller.cc",
@@ -838,12 +865,14 @@ component("ash") {
     "//cc",
     "//components/device_event_log",
     "//components/onc",
+    "//components/session_manager:base",
     "//components/signin/core/account_id",
+    "//components/ui_devtools",
     "//components/user_manager",
     "//components/wallpaper",
     "//media",
     "//net",
-    "//services/shell/public/cpp",
+    "//services/service_manager/public/cpp",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
@@ -1011,228 +1040,6 @@ component("ash_with_content") {
   ]
 }
 
-# Used to test ash with an aura backend.
-source_set("ash_with_aura_test_support") {
-  testonly = true
-  sources = [
-    "test/ash_test_impl_aura.cc",
-    "test/ash_test_impl_aura.h",
-  ]
-  deps = [
-    ":ash",
-    ":test_support_common",
-    "//base",
-    "//skia",
-    "//ui/aura:test_support",
-    "//ui/display",
-    "//ui/wm",
-  ]
-}
-
-# Internal target consumed by |test_support_with_content| and
-# |test_support_without_content|. This target contains all the test support
-# files, with the exception of an implementation of AshTestEnvironment.
-# Consumers of ash should use one of |test_support_with_content| or
-# |test_support_without_content|.
-static_library("test_support_common") {
-  testonly = true
-  visibility = [ ":*" ]
-  sources = [
-    "common/test/ash_test.cc",
-    "common/test/ash_test.h",
-    "common/test/ash_test_impl.h",
-    "common/test/material_design_controller_test_api.cc",
-    "common/test/material_design_controller_test_api.h",
-    "common/test/test_palette_delegate.cc",
-    "common/test/test_palette_delegate.h",
-    "common/test/test_volume_control_delegate.cc",
-    "common/test/test_volume_control_delegate.h",
-    "shell/toplevel_window.cc",
-    "shell/toplevel_window.h",
-    "test/ash_md_test_base.cc",
-    "test/ash_md_test_base.h",
-    "test/ash_test_base.cc",
-    "test/ash_test_base.h",
-    "test/ash_test_environment.h",
-    "test/ash_test_helper.cc",
-    "test/ash_test_helper.h",
-    "test/ash_test_views_delegate.cc",
-    "test/ash_test_views_delegate.h",
-    "test/child_modal_window.cc",
-    "test/child_modal_window.h",
-    "test/cursor_manager_test_api.cc",
-    "test/cursor_manager_test_api.h",
-    "test/display_manager_test_api.cc",
-    "test/display_manager_test_api.h",
-    "test/immersive_fullscreen_controller_test_api.cc",
-    "test/immersive_fullscreen_controller_test_api.h",
-    "test/mirror_window_test_api.cc",
-    "test/mirror_window_test_api.h",
-    "test/overflow_bubble_view_test_api.cc",
-    "test/overflow_bubble_view_test_api.h",
-    "test/shelf_button_pressed_metric_tracker_test_api.cc",
-    "test/shelf_button_pressed_metric_tracker_test_api.h",
-    "test/shelf_view_test_api.cc",
-    "test/shelf_view_test_api.h",
-    "test/shell_test_api.cc",
-    "test/shell_test_api.h",
-    "test/status_area_widget_test_helper.cc",
-    "test/status_area_widget_test_helper.h",
-    "test/task_switch_time_tracker_test_api.cc",
-    "test/task_switch_time_tracker_test_api.h",
-    "test/test_activation_delegate.cc",
-    "test/test_activation_delegate.h",
-    "test/test_keyboard_ui.cc",
-    "test/test_keyboard_ui.h",
-    "test/test_lock_state_controller_delegate.cc",
-    "test/test_lock_state_controller_delegate.h",
-    "test/test_overlay_delegate.cc",
-    "test/test_overlay_delegate.h",
-    "test/test_screenshot_delegate.cc",
-    "test/test_screenshot_delegate.h",
-    "test/test_session_state_animator.cc",
-    "test/test_session_state_animator.h",
-    "test/test_session_state_delegate.cc",
-    "test/test_session_state_delegate.h",
-    "test/test_shelf_delegate.cc",
-    "test/test_shelf_delegate.h",
-    "test/test_shelf_item_delegate.cc",
-    "test/test_shelf_item_delegate.h",
-    "test/test_shell_delegate.cc",
-    "test/test_shell_delegate.h",
-    "test/test_suite.cc",
-    "test/test_suite.h",
-    "test/test_suite_init.h",
-    "test/test_suite_init.mm",
-    "test/test_system_tray_delegate.cc",
-    "test/test_system_tray_delegate.h",
-    "test/test_system_tray_item.cc",
-    "test/test_system_tray_item.h",
-    "test/test_wallpaper_delegate.cc",
-    "test/test_wallpaper_delegate.h",
-    "test/tray_cast_test_api.cc",
-    "test/tray_cast_test_api.h",
-    "test/ui_controls_factory_ash.cc",
-    "test/ui_controls_factory_ash.h",
-    "test/user_metrics_recorder_test_api.cc",
-    "test/user_metrics_recorder_test_api.h",
-  ]
-  configs += [ "//build/config:precompiled_headers" ]
-
-  public_deps = [
-    ":ash",
-  ]
-  deps = [
-    "//ash/resources",
-    "//base:i18n",
-    "//base/test:test_support",
-    "//components/signin/core/account_id",
-    "//components/user_manager:user_manager",
-    "//device/bluetooth",
-    "//skia",
-    "//testing/gtest",
-    "//ui/accessibility",
-    "//ui/app_list:test_support",
-    "//ui/app_list/presenter",
-    "//ui/aura",
-    "//ui/aura:test_support",
-    "//ui/base:test_support",
-    "//ui/compositor:test_support",
-    "//ui/display/types",
-    "//ui/events:events_base",
-    "//ui/events:test_support",
-    "//ui/events/devices",
-    "//ui/gl",
-    "//ui/gl:test_support",
-    "//ui/keyboard",
-    "//ui/message_center",
-    "//ui/views",
-    "//ui/views:test_support",
-    "//ui/wm",
-  ]
-
-  if (is_win) {
-    deps += [ "//ui/platform_window/win" ]
-  }
-
-  if (use_x11) {
-    deps += [ "//ui/gfx/x" ]
-  }
-
-  if (is_chromeos) {
-    deps += [
-      "//chromeos",
-      "//ui/display",
-    ]
-
-    sources += [
-      "laser/laser_pointer_controller_test_api.cc",
-      "laser/laser_pointer_controller_test_api.h",
-      "laser/laser_pointer_points_test_api.cc",
-      "laser/laser_pointer_points_test_api.h",
-    ]
-  }
-}
-
-static_library("test_support_without_content") {
-  testonly = true
-  sources = [
-    "test/ash_test_environment_default.cc",
-  ]
-
-  public_deps = [
-    ":test_support_common",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//skia",
-  ]
-}
-
-static_library("test_support_with_content") {
-  testonly = true
-  sources = [
-    "test/ash_test_environment_content.cc",
-    "test/ash_test_environment_content.h",
-    "test/content/test_shell_content_state.cc",
-    "test/content/test_shell_content_state.h",
-  ]
-  configs += [ "//build/config:precompiled_headers" ]
-
-  public_deps = [
-    ":ash_with_content",
-    ":test_support_common",
-    "//content/public/browser",
-    "//content/test:test_support",
-    "//skia",
-  ]
-}
-
-static_library("interactive_ui_test_support") {
-  testonly = true
-  configs += [ "//build/config:precompiled_headers" ]
-  public_deps = [
-    ":ash",
-    ":test_support_without_content",
-  ]
-  sources = [
-    "test/ash_interactive_ui_test_base.cc",
-    "test/ash_interactive_ui_test_base.h",
-  ]
-  deps = [
-    ":ash",
-    ":test_support_with_content",
-    "//base",
-    "//skia",
-    "//testing/gtest",
-    "//ui/aura",
-    "//ui/base",
-    "//ui/gl:test_support",
-  ]
-}
-
 static_library("ash_shell_lib") {
   testonly = true
   sources = [
@@ -1250,45 +1057,32 @@ static_library("ash_shell_lib") {
     "shell/toplevel_window.cc",
     "shell/toplevel_window.h",
     "shell/widgets.cc",
-    "shell/window_type_launcher.cc",
-    "shell/window_type_launcher.h",
     "shell/window_watcher.cc",
     "shell/window_watcher.h",
     "shell/window_watcher_shelf_item_delegate.cc",
     "shell/window_watcher_shelf_item_delegate.h",
   ]
 
+  # Usage of content should be in ash_shell_lib_with_content.
+  assert_no_deps = [ "//content/*" ]
+
   deps = [
     ":ash",
-    ":ash_with_content",
-    ":test_support_without_content",
-    "//ash/common/strings",
+    "//ash/common/test:test_support",
     "//ash/public/cpp",
-    "//ash/resources",
+    "//ash/test:test_support_without_content",
     "//base",
     "//base:i18n",
     "//components/user_manager",
-    "//net",
     "//skia",
-    "//third_party/icu",
     "//ui/app_list/presenter",
     "//ui/aura",
     "//ui/base",
-    "//ui/base/ime",
-    "//ui/compositor",
-    "//ui/events",
-    "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/keyboard",
-    "//ui/keyboard:keyboard_with_content",
-    "//ui/message_center",
-    "//ui/resources",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/views/examples:views_examples_lib",
-    "//ui/views/examples:views_examples_with_content_lib",
-    "//ui/wm",
   ]
 }
 
@@ -1303,11 +1097,15 @@ static_library("ash_shell_lib_with_content") {
     "shell/content/client/shell_main_delegate.h",
     "shell/content/shell_content_state_impl.cc",
     "shell/content/shell_content_state_impl.h",
+    "shell/window_type_launcher.cc",
+    "shell/window_type_launcher.h",
   ]
 
   deps = [
     ":ash_shell_lib",
     ":ash_with_content",
+    "//ash/public/cpp",
+    "//ash/test:test_support_without_content",
     "//base:i18n",
     "//chrome:packed_resources",
     "//content",
@@ -1317,11 +1115,13 @@ static_library("ash_shell_lib_with_content") {
     "//skia",
     "//ui/aura",
     "//ui/base",
+    "//ui/base/ime",
     "//ui/compositor",
     "//ui/display",
     "//ui/events/devices",
     "//ui/message_center",
     "//ui/views:test_support",
+    "//ui/views/examples:views_examples_with_content_lib",
     "//ui/wm",
   ]
 
@@ -1346,10 +1146,11 @@ test("ash_content_unittests") {
 
   deps = [
     ":ash",
-    ":ash_with_aura_test_support",
     ":ash_with_content",
-    ":test_support_with_content",
+    "//ash/common/test:test_support",
     "//ash/public/cpp",
+    "//ash/test:ash_with_aura_test_support",
+    "//ash/test:test_support_with_content",
     "//base",
     "//base/test:test_support",
     "//components/signin/core/account_id",
@@ -1386,7 +1187,6 @@ test("ash_content_unittests") {
       "//ui/chromeos",
       "//ui/display",
       "//ui/display:test_support",
-      "//ui/display:test_util",
     ]
   }
 }
@@ -1402,20 +1202,31 @@ test("ash_unittests") {
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "aura/pointer_watcher_adapter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
-    "common/accelerators/accelerator_table_unittest.cc",
+    "common/devtools/ash_devtools_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654489.
     "common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "common/frame/custom_frame_view_ash_unittest.cc",
     "common/frame/default_header_painter_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654491.
     "common/material_design/material_design_controller_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654492.
     "common/metrics/pointer_metrics_recorder_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654493.
     "common/popup_message_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654494.
     "common/shelf/shelf_background_animator_unittest.cc",
     "common/shelf/shelf_button_pressed_metric_tracker_unittest.cc",
     "common/shelf/shelf_locking_manager_unittest.cc",
     "common/shelf/shelf_model_unittest.cc",
     "common/shelf/shelf_tooltip_manager_unittest.cc",
     "common/shelf/shelf_window_watcher_unittest.cc",
-    "common/system/chromeos/brightness/tray_brightness_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654495.
     "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc",
     "common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc",
     "common/system/chromeos/palette/mock_palette_tool_delegate.cc",
@@ -1426,24 +1237,22 @@ test("ash_unittests") {
     "common/system/chromeos/power/power_status_unittest.cc",
     "common/system/chromeos/power/power_status_view_unittest.cc",
     "common/system/chromeos/power/tray_power_unittest.cc",
-    "common/system/chromeos/screen_security/screen_tray_item_unittest.cc",
     "common/system/chromeos/session/logout_confirmation_controller_unittest.cc",
     "common/system/chromeos/session/tray_session_length_limit_unittest.cc",
-    "common/system/chromeos/supervised/tray_supervised_user_unittest.cc",
-    "common/system/date/date_view_unittest.cc",
+    "common/system/date/system_info_default_view_unittest.cc",
     "common/system/ime/tray_ime_chromeos_unittest.cc",
     "common/system/tiles/tray_tiles_unittest.cc",
+    "common/system/tray/size_range_layout_unittest.cc",
     "common/system/tray/system_tray_unittest.cc",
     "common/system/tray/tray_details_view_unittest.cc",
-    "common/system/update/tray_update_unittest.cc",
+    "common/system/tray/tri_view_unittest.cc",
     "common/system/user/tray_user_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654517.
     "common/wallpaper/wallpaper_controller_unittest.cc",
-    "common/wm/container_finder_unittest.cc",
+
+    # TODO: convert to use AshTest http://crbug.com/654524.
     "common/wm/overview/cleanup_animation_observer_unittest.cc",
-    "common/wm/workspace/workspace_event_handler_test_helper.cc",
-    "common/wm/workspace/workspace_event_handler_test_helper.h",
-    "common/wm_window_unittest.cc",
-    "common/wm_window_user_data_unittest.cc",
     "dip_unittest.cc",
     "display/cursor_window_controller_unittest.cc",
     "display/display_change_observer_chromeos_unittest.cc",
@@ -1484,6 +1293,7 @@ test("ash_unittests") {
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
     "system/chromeos/power/power_event_observer_unittest.cc",
+    "system/chromeos/power/tablet_power_button_controller_unittest.cc",
     "system/chromeos/power/video_activity_notifier_unittest.cc",
     "system/chromeos/rotation/tray_rotation_lock_unittest.cc",
     "system/chromeos/screen_layout_observer_unittest.cc",
@@ -1513,7 +1323,6 @@ test("ash_unittests") {
     "wm/maximize_mode/accelerometer_test_data_literals.cc",
     "wm/maximize_mode/maximize_mode_controller_unittest.cc",
     "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
-    "wm/mru_window_tracker_unittest.cc",
     "wm/overlay_event_filter_unittest.cc",
     "wm/overview/window_selector_unittest.cc",
     "wm/panels/panel_layout_manager_unittest.cc",
@@ -1538,7 +1347,7 @@ test("ash_unittests") {
     "wm/workspace/magnetism_matcher_unittest.cc",
     "wm/workspace/multi_window_resize_controller_unittest.cc",
     "wm/workspace/workspace_event_handler_unittest.cc",
-    "wm/workspace/workspace_layout_manager_unittest.cc",
+    "wm/workspace/workspace_layout_manager_keyboard_unittest.cc",
     "wm/workspace/workspace_window_resizer_unittest.cc",
     "wm/workspace_controller_test_helper.cc",
     "wm/workspace_controller_test_helper.h",
@@ -1551,12 +1360,14 @@ test("ash_unittests") {
 
   deps = [
     ":ash",
-    ":ash_with_aura_test_support",
-    ":test_support_without_content",
     "//ash/autoclick/common:autoclick",
+    "//ash/common:unittests",
     "//ash/common/strings",
+    "//ash/common/test:test_support",
     "//ash/public/cpp",
     "//ash/resources",
+    "//ash/test:ash_with_aura_test_support",
+    "//ash/test:test_support_without_content",
     "//ash/touch_hud",
     "//base",
     "//base/test:test_support",
@@ -1621,7 +1432,6 @@ test("ash_unittests") {
       "//ui/chromeos",
       "//ui/display",
       "//ui/display:test_support",
-      "//ui/display:test_util",
     ]
   } else {
     sources -= [
diff --git a/chromium/ash/autoclick/mus/BUILD.gn b/chromium/ash/autoclick/mus/BUILD.gn
index 140dd0e5f73..7517167162c 100644
--- a/chromium/ash/autoclick/mus/BUILD.gn
+++ b/chromium/ash/autoclick/mus/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 source_set("lib") {
@@ -16,13 +16,14 @@ source_set("lib") {
   deps = [
     "//ash/autoclick/common:autoclick",
     "//ash/autoclick/mus/public/interfaces",
+    "//ash/public/cpp",
     "//ash/public/interfaces",
     "//base",
     "//mash/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//ui/views",
@@ -43,8 +44,8 @@ service("accessibility_autoclick") {
     ":lib",
     "//base",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
     "//ui/views/mus:for_mojo_application",
   ]
 
diff --git a/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn b/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn
index 96676819b5f..09c0b8a4d26 100644
--- a/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn
+++ b/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn
@@ -8,6 +8,4 @@ mojom("interfaces") {
   sources = [
     "autoclick.mojom",
   ]
-
-  use_new_wrapper_types = true
 }
diff --git a/chromium/ash/common/BUILD.gn b/chromium/ash/common/BUILD.gn
new file mode 100644
index 00000000000..eedb73c1aa0
--- /dev/null
+++ b/chromium/ash/common/BUILD.gn
@@ -0,0 +1,38 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("unittests") {
+  testonly = true
+  sources = [
+    "accelerators/accelerator_table_unittest.cc",
+    "system/date/date_view_unittest.cc",
+    "system/update/tray_update_unittest.cc",
+    "wm/container_finder_unittest.cc",
+    "wm/mru_window_tracker_unittest.cc",
+    "wm/workspace/workspace_layout_manager_unittest.cc",
+    "wm_window_unittest.cc",
+    "wm_window_user_data_unittest.cc",
+  ]
+  deps = [
+    "//ash",
+    "//ash/common/test:test_support",
+    "//ash/public/cpp",
+    "//ash/test:test_support_without_content",
+    "//ui/base",
+    "//ui/display",
+    "//ui/keyboard",
+    "//ui/views",
+    "//ui/wm",
+  ]
+
+  if (is_chromeos) {
+    sources += [
+      "system/chromeos/audio/tray_audio_unittest.cc",
+      "system/chromeos/brightness/tray_brightness_unittest.cc",
+      "system/chromeos/screen_security/screen_tray_item_unittest.cc",
+      "system/chromeos/supervised/tray_supervised_user_unittest.cc",
+    ]
+    deps += [ "//ui/message_center" ]
+  }
+}
diff --git a/chromium/ash/common/test/BUILD.gn b/chromium/ash/common/test/BUILD.gn
new file mode 100644
index 00000000000..038998a51d4
--- /dev/null
+++ b/chromium/ash/common/test/BUILD.gn
@@ -0,0 +1,51 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("test_support") {
+  testonly = true
+  sources = [
+    "ash_test.cc",
+    "ash_test.h",
+    "ash_test_impl.h",
+    "material_design_controller_test_api.cc",
+    "material_design_controller_test_api.h",
+    "test_new_window_client.cc",
+    "test_new_window_client.h",
+    "test_palette_delegate.cc",
+    "test_palette_delegate.h",
+    "test_session_state_delegate.cc",
+    "test_session_state_delegate.h",
+    "test_shelf_delegate.cc",
+    "test_shelf_delegate.h",
+    "test_shelf_item_delegate.cc",
+    "test_shelf_item_delegate.h",
+    "test_system_tray_delegate.cc",
+    "test_system_tray_delegate.h",
+    "wm_shell_test_api.cc",
+    "wm_shell_test_api.h",
+    "workspace_event_handler_test_helper.cc",
+    "workspace_event_handler_test_helper.h",
+  ]
+  configs += [ "//build/config:precompiled_headers" ]
+
+  public_deps = [
+    "//testing/gtest",
+  ]
+  deps = [
+    "//ash",
+    "//ash/public/cpp",
+    "//ash/public/interfaces",
+    "//base",
+    "//components/signin/core/account_id",
+    "//components/user_manager",
+
+    # TODO: this is for ui/wm/public/window_types.h, which is in aura.
+    # http://crbug.com/654078.
+    "//ui/aura",
+    "//ui/display",
+    "//ui/gfx/geometry",
+    "//ui/views",
+    "//ui/wm",
+  ]
+}
diff --git a/chromium/ash/mus/BUILD.gn b/chromium/ash/mus/BUILD.gn
index 9becfce4efe..92a005d5a39 100644
--- a/chromium/ash/mus/BUILD.gn
+++ b/chromium/ash/mus/BUILD.gn
@@ -4,8 +4,8 @@
 
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//tools/grit/repack.gni")
 
 source_set("lib") {
@@ -16,8 +16,6 @@ source_set("lib") {
     "accelerators/accelerator_controller_registrar.h",
     "accelerators/accelerator_handler.h",
     "accelerators/accelerator_ids.h",
-    "accelerators/accelerator_registrar_impl.cc",
-    "accelerators/accelerator_registrar_impl.h",
     "accessibility_delegate_mus.cc",
     "accessibility_delegate_mus.h",
     "app_list_presenter_mus.cc",
@@ -38,8 +36,6 @@ source_set("lib") {
     "bridge/wm_window_mus.h",
     "bridge/workspace_event_handler_mus.cc",
     "bridge/workspace_event_handler_mus.h",
-    "container_ids.cc",
-    "container_ids.h",
     "context_menu_mus.cc",
     "context_menu_mus.h",
     "disconnected_app_handler.cc",
@@ -59,8 +55,6 @@ source_set("lib") {
     "move_event_handler.h",
     "native_widget_factory_mus.cc",
     "native_widget_factory_mus.h",
-    "new_window_delegate_mus.cc",
-    "new_window_delegate_mus.h",
     "non_client_frame_controller.cc",
     "non_client_frame_controller.h",
     "property_util.cc",
@@ -100,13 +94,14 @@ source_set("lib") {
 
   public_deps = [
     "//ash",
+    "//ash/public/cpp",
     "//ash/public/interfaces",
     "//base",
     "//base:i18n",
     "//mash/public/interfaces",
     "//mash/session/public/interfaces",
     "//mojo/common:common_base",
-    "//services/shell/public/cpp",
+    "//services/service_manager/public/cpp",
     "//services/tracing/public/cpp",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
@@ -131,6 +126,8 @@ source_set("lib") {
 
   if (is_chromeos) {
     sources += [
+      "network_connect_delegate_mus.cc",
+      "network_connect_delegate_mus.h",
       "system_tray_delegate_mus.cc",
       "system_tray_delegate_mus.h",
       "vpn_delegate_mus.cc",
@@ -157,7 +154,7 @@ service("mus") {
     ":lib",
     ":resources",
     ":resources_200",
-    "//services/shell/public/cpp",
+    "//services/service_manager/public/cpp",
   ]
 
   # TODO(beng): This target relies on //mash/session, but there is a cycle so we
@@ -234,11 +231,9 @@ source_set("unittests") {
   testonly = true
 
   sources = [
-    "../common/wm_window_unittest.cc",
     "accelerators/accelerator_controller_registrar_test_api.cc",
     "accelerators/accelerator_controller_registrar_test_api.h",
     "accelerators/accelerator_controller_unittest.cc",
-    "accelerators/accelerator_registrar_unittest.cc",
     "app_launch_unittest.cc",
     "bridge/wm_shell_mus_test_api.h",
     "bridge/wm_window_mus_test_api.h",
@@ -251,22 +246,19 @@ source_set("unittests") {
     "test/wm_test_helper.cc",
     "test/wm_test_helper.h",
     "window_manager_unittest.cc",
-    "wm/container_finder_unittest.cc",
-    "wm/mru_window_tracker_unittest.cc",
-    "workspace/workspace_layout_manager_unittest.cc",
   ]
 
   deps = [
     ":lib",
     ":resources",
     "//ash",
-    "//ash:test_support_without_content",
+    "//ash/common/test:test_support",
     "//ash/public/interfaces",
     "//base",
     "//base/test:test_config",
     "//base/test:test_support",
     "//mojo/public/cpp/system",
-    "//services/shell/public/cpp:service_test_support",
+    "//services/service_manager/public/cpp:service_test_support",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
     "//services/ui/public/cpp/tests:test_support",
@@ -294,9 +286,4 @@ source_set("unittests") {
   ]
 
   defines = [ "NOTIMPLEMENTED_POLICY=5" ]
-
-  if (is_chromeos) {
-    sources +=
-        [ "../common/system/chromeos/brightness/tray_brightness_unittest.cc" ]
-  }
 }
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index ea64e0fbe9c..9f3bf5644d3 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -6,5 +6,11 @@
 source_set("cpp") {
   sources = [
     "shelf_types.h",
+    "shell_window_ids.cc",
+    "shell_window_ids.h",
+  ]
+
+  deps = [
+    "//base",
   ]
 }
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 0570864ba57..f634af3a172 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -7,9 +7,12 @@ import("//mojo/public/tools/bindings/mojom.gni")
 mojom("interfaces") {
   sources = [
     "ash_window_type.mojom",
-    "container.mojom",
+    "locale.mojom",
+    "new_window.mojom",
     "shelf.mojom",
+    "shutdown.mojom",
     "system_tray.mojom",
+    "volume.mojom",
     "wallpaper.mojom",
   ]
 
diff --git a/chromium/ash/public/interfaces/container.mojom b/chromium/ash/public/interfaces/container.mojom
deleted file mode 100644
index f363d7fa7ed..00000000000
--- a/chromium/ash/public/interfaces/container.mojom
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-// Containers windows may be parented to.
-// NOTE: this is not the complete list of containers created by ash. See
-// ash/common/shell_window_ids.h for the complete this. This is only a subset
-// that other apps may need to parent windows to.
-enum Container {
-  // TODO: remove everything but LOGIN_WINDOWS, http://crbug.com/616859.
-  WALLPAPER,
-  USER_PRIVATE_SHELF,
-  LOGIN_WINDOWS,
-  // Status area widget and message center notification popups.
-  STATUS,
-  // Bubble windows, for example the sysui system tray bubble and the screen
-  // brightness bubble.
-  BUBBLES,
-  MENUS,
-  DRAG_AND_TOOLTIPS,
-  OVERLAY,
-};
-
-const string kWindowContainer_Property = "ash:window-container";
diff --git a/chromium/ash/public/interfaces/locale.mojom b/chromium/ash/public/interfaces/locale.mojom
new file mode 100644
index 00000000000..756430d81f5
--- /dev/null
+++ b/chromium/ash/public/interfaces/locale.mojom
@@ -0,0 +1,21 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module ash.mojom;
+
+// Sent as the response to LocaleNotificationController.OnLocaleChanged().
+enum LocaleNotificationResult {
+  ACCEPT,
+  REVERT
+};
+
+// Used by Chrome to make ash show a notification.
+interface LocaleNotificationController {
+  // Displays a notification in ash prompting the user whether to accept a
+  // change in the locale. If the user clicks the accept button (or closes the
+  // notification), OnLocaleChange() returns ACCEPT. If the user clicks the
+  // revert button, returns REVERT.
+  OnLocaleChanged(string current, string from, string to)
+      => (LocaleNotificationResult result);
+};
diff --git a/chromium/ash/public/interfaces/new_window.mojom b/chromium/ash/public/interfaces/new_window.mojom
new file mode 100644
index 00000000000..08a49f0c3a5
--- /dev/null
+++ b/chromium/ash/public/interfaces/new_window.mojom
@@ -0,0 +1,36 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module ash.mojom;
+
+// A delegate interface delegate to create or open windows that are not part of
+// ash.
+interface NewWindowClient {
+  // Invoked when the user uses Ctrl+T to open a new tab.
+  NewTab();
+
+  // Invoked when the user uses Ctrl-N or Ctrl-Shift-N to open a new window.
+  NewWindow(bool incognito);
+
+  // Invoked when an accelerator is used to open the file manager.
+  OpenFileManager();
+
+  // Invoked when the user opens Crosh.
+  OpenCrosh();
+
+  // Invoked when an accelerator is used to open help center.
+  OpenGetHelp();
+
+  // Invoked when the user uses Shift+Ctrl+T to restore the closed tab.
+  RestoreTab();
+
+  // Shows the keyboard shortcut overlay.
+  ShowKeyboardOverlay();
+
+  // Shows the task manager window.
+  ShowTaskManager();
+
+  // Opens the feedback page for "Report Issue".
+  OpenFeedbackPage();
+};
diff --git a/chromium/ash/public/interfaces/shutdown.mojom b/chromium/ash/public/interfaces/shutdown.mojom
new file mode 100644
index 00000000000..4785e773aef
--- /dev/null
+++ b/chromium/ash/public/interfaces/shutdown.mojom
@@ -0,0 +1,14 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module ash.mojom;
+
+// Interface implemented by ash and used by chrome to provide shutdown policy
+// information. Exists because device policy is owned by chrome, not ash.
+interface ShutdownController {
+  // Sets a boolean pref that indicates whether the device automatically reboots
+  // when the user initiates a shutdown via an UI element. Used in enterprise
+  // environments for devices that should not be shut down.
+  SetRebootOnShutdown(bool reboot_on_shutdown);
+};
diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom
index 3cdb3e1be62..fac42de7cd1 100644
--- a/chromium/ash/public/interfaces/system_tray.mojom
+++ b/chromium/ash/public/interfaces/system_tray.mojom
@@ -20,7 +20,8 @@ interface SystemTrayClient {
   // Shows the settings related to date, timezone etc.
   ShowDateSettings();
 
-  // TODO(crbug.com/647412): ShowSetTimeDialog();
+  // Shows the dialog to set system time, date, and timezone.
+  ShowSetTimeDialog();
 
   // Shows settings related to multiple displays.
   ShowDisplaySettings();
@@ -54,6 +55,15 @@ interface SystemTrayClient {
 
   // TODO(crbug.com/647412): ShowEnterpriseInfo();
 
+  // Shows UI to configure or activate the network specified by |network_id|,
+  // which may include showing payment or captive portal UI when appropriate.
+  ShowNetworkConfigure(string network_id);
+
+  // Shows UI to create a new network connection. The |type| is a Shill/Flimflam
+  // network type from third_party/cros_system_api/dbus/shill/dbus-constants.h
+  // ('wifi', 'cellular', etc.).
+  ShowNetworkCreate(string type);
+
   // Shows settings related to networking. If |network_id| is empty, shows
   // general settings. Otherwise shows settings for the individual network.
   // On devices |network_id| is a GUID, but on Linux desktop and in tests it can
@@ -62,4 +72,11 @@ interface SystemTrayClient {
 
   // Shows UI for changing proxy settings.
   ShowProxySettings();
+
+  // Attempts to sign out the user.
+  // TODO(jamescook): Migrate to a user or login service. crbug.com/665582
+  SignOut();
+
+  // Attempts to restart the system for update.
+  RequestRestartForUpdate();
 };
diff --git a/chromium/ash/public/interfaces/typemaps.gni b/chromium/ash/public/interfaces/typemaps.gni
index 33df2c31fa3..e10024a0116 100644
--- a/chromium/ash/public/interfaces/typemaps.gni
+++ b/chromium/ash/public/interfaces/typemaps.gni
@@ -2,4 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-typemaps = [ "//ash/public/interfaces/shelf.typemap" ]
+typemaps = [
+  "//ash/public/interfaces/shelf.typemap",
+  "//ash/public/interfaces/wallpaper.typemap",
+]
diff --git a/chromium/ash/public/interfaces/volume.mojom b/chromium/ash/public/interfaces/volume.mojom
new file mode 100644
index 00000000000..85bd93928bb
--- /dev/null
+++ b/chromium/ash/public/interfaces/volume.mojom
@@ -0,0 +1,17 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module ash.mojom;
+
+// Implemented by Chrome and used by ash to request audio volume changes.
+// Implemented by Chrome because it's currently the only client of audio dbus
+// interfaces (via CrasAudioHandler); this may be simplified if that changes.
+interface VolumeController {
+  // Mute the audio volume.
+  VolumeMute();
+  // Decrease the audio volume.
+  VolumeDown();
+  // Increase the audio volume.
+  VolumeUp();
+};
diff --git a/chromium/ash/public/interfaces/wallpaper.mojom b/chromium/ash/public/interfaces/wallpaper.mojom
index fd04d84fa62..e03b28c89d3 100644
--- a/chromium/ash/public/interfaces/wallpaper.mojom
+++ b/chromium/ash/public/interfaces/wallpaper.mojom
@@ -11,10 +11,15 @@ enum WallpaperLayout { CENTER, CENTER_CROPPED, STRETCH, TILE, };
 
 // Used by Chrome to set the wallpaper displayed by ash.
 interface WallpaperController {
+  // Set the wallpaper bitmap and layout used for the ash desktop background.
+  // A null or empty |wallpaper| bitmap is treated as a no-op.
+  // TODO(crbug.com/655875): Optimize ash wallpaper transport; avoid sending
+  // large bitmaps over Mojo; use shared memory like BitmapUploader, etc.
   SetWallpaper(skia.mojom.Bitmap? wallpaper, WallpaperLayout layout);
 };
 
 // Used by ash to trigger Chrome's wallpaper picker functionality.
 interface WallpaperManager {
+  // Open the wallpaper picker window.
   Open();
 };
diff --git a/chromium/ash/public/interfaces/wallpaper.typemap b/chromium/ash/public/interfaces/wallpaper.typemap
new file mode 100644
index 00000000000..a8612da74e9
--- /dev/null
+++ b/chromium/ash/public/interfaces/wallpaper.typemap
@@ -0,0 +1,11 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+mojom = "//ash/public/interfaces/wallpaper.mojom"
+public_headers = [ "//components/wallpaper/wallpaper_layout.h" ]
+traits_headers = [ "//ash/public/interfaces/wallpaper_enum_traits.h" ]
+public_deps = [
+  "//ash/public/cpp",
+]
+type_mappings = [ "ash.mojom.WallpaperLayout=wallpaper::WallpaperLayout" ]
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 134942b7586..dd753e9b66d 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -12,8 +12,44 @@ action("aggregate_vector_icons") {
     "ime_menu_emoticon.icon",
     "ime_menu_microphone.1x.icon",
     "ime_menu_microphone.icon",
+    "ime_menu_on_screen_keyboard.1x.icon",
+    "ime_menu_on_screen_keyboard.icon",
     "ime_menu_write.1x.icon",
     "ime_menu_write.icon",
+    "network_badge_add_other.1x.icon",
+    "network_badge_add_other.icon",
+    "network_badge_captive_portal.1x.icon",
+    "network_badge_captive_portal.icon",
+    "network_badge_roaming.1x.icon",
+    "network_badge_roaming.icon",
+    "network_badge_secure.1x.icon",
+    "network_badge_secure.icon",
+    "network_badge_technology_1x.1x.icon",
+    "network_badge_technology_1x.icon",
+    "network_badge_technology_3g.1x.icon",
+    "network_badge_technology_3g.icon",
+    "network_badge_technology_4g.1x.icon",
+    "network_badge_technology_4g.icon",
+    "network_badge_technology_edge.1x.icon",
+    "network_badge_technology_edge.icon",
+    "network_badge_technology_evdo.1x.icon",
+    "network_badge_technology_evdo.icon",
+    "network_badge_technology_gprs.1x.icon",
+    "network_badge_technology_gprs.icon",
+    "network_badge_technology_hspa.1x.icon",
+    "network_badge_technology_hspa.icon",
+    "network_badge_technology_hspa_plus.1x.icon",
+    "network_badge_technology_hspa_plus.icon",
+    "network_badge_technology_lte.1x.icon",
+    "network_badge_technology_lte.icon",
+    "network_badge_technology_lte_advanced.1x.icon",
+    "network_badge_technology_lte_advanced.icon",
+    "network_badge_vpn.1x.icon",
+    "network_badge_vpn.icon",
+    "network_ethernet.1x.icon",
+    "network_ethernet.icon",
+    "network_vpn.1x.icon",
+    "network_vpn.icon",
     "palette_action_capture_region.1x.icon",
     "palette_action_capture_region.icon",
     "palette_action_capture_screen.1x.icon",
@@ -32,8 +68,6 @@ action("aggregate_vector_icons") {
     "palette_tray_icon_laser_pointer.icon",
     "palette_tray_icon_magnify.1x.icon",
     "palette_tray_icon_magnify.icon",
-    "shelf_app_list.1x.icon",
-    "shelf_app_list.icon",
     "shelf_notifications.1x.icon",
     "shelf_notifications.icon",
     "system_menu_accessibility.1x.icon",
@@ -47,13 +81,21 @@ action("aggregate_vector_icons") {
     "system_menu_accessibility_large_cursor.1x.icon",
     "system_menu_accessibility_large_cursor.icon",
     "system_menu_accessibility_screen_magnifier.1x.icon",
+    "system_menu_audio_input.icon",
+    "system_menu_audio_input.1x.icon",
+    "system_menu_audio_output.icon",
+    "system_menu_audio_output.1x.icon",
     "system_menu_accessibility_screen_magnifier.icon",
+    "system_menu_add_connection.1x.icon",
+    "system_menu_add_connection.icon",
     "system_menu_arrow_back.1x.icon",
     "system_menu_arrow_back.icon",
     "system_menu_arrow_right.1x.icon",
     "system_menu_arrow_right.icon",
     "system_menu_bluetooth.1x.icon",
     "system_menu_bluetooth.icon",
+    "system_menu_bluetooth_connected.1x.icon",
+    "system_menu_bluetooth_connected.icon",
     "system_menu_bluetooth_disabled.1x.icon",
     "system_menu_bluetooth_disabled.icon",
     "system_menu_brightness.1x.icon",
@@ -64,14 +106,32 @@ action("aggregate_vector_icons") {
     "system_menu_caps_lock.icon",
     "system_menu_cast.1x.icon",
     "system_menu_cast.icon",
+    "system_menu_cast_device.1x.icon",
+    "system_menu_cast_device.icon",
     "system_menu_child_user.1x.icon",
     "system_menu_child_user.icon",
+    "system_menu_computer.1x.icon",
+    "system_menu_computer.icon",
+    "system_menu_gamepad.1x.icon",
+    "system_menu_gamepad.icon",
+    "system_menu_guest.1x.icon",
+    "system_menu_guest.icon",
+    "system_menu_hdmi.1x.icon",
+    "system_menu_hdmi.icon",
+    "system_menu_headset.1x.icon",
+    "system_menu_headset.icon",
     "system_menu_help.1x.icon",
     "system_menu_help.icon",
+    "system_menu_info.1x.icon",
+    "system_menu_info.icon",
     "system_menu_keyboard.1x.icon",
     "system_menu_keyboard.icon",
     "system_menu_lock.1x.icon",
     "system_menu_lock.icon",
+    "system_menu_mouse.1x.icon",
+    "system_menu_mouse.icon",
+    "system_menu_phone.1x.icon",
+    "system_menu_phone.icon",
     "system_menu_power.1x.icon",
     "system_menu_power.icon",
     "system_menu_rotation_lock_auto.1x.icon",
@@ -85,10 +145,28 @@ action("aggregate_vector_icons") {
     "system_menu_sms.icon",
     "system_menu_supervised_user.1x.icon",
     "system_menu_supervised_user.icon",
+    "system_menu_tablet.1x.icon",
+    "system_menu_tablet.icon",
     "system_menu_timer.1x.icon",
+    "system_menu_tracing.1x.icon",
+    "system_menu_tracing.icon",
     "system_menu_timer.icon",
     "system_menu_update.1x.icon",
     "system_menu_update.icon",
+    "system_menu_new_user.1x.icon",
+    "system_menu_new_user.icon",
+    "system_menu_usb.1x.icon",
+    "system_menu_usb.icon",
+    "system_menu_videocam.1x.icon",
+    "system_menu_videocam.icon",
+    "system_menu_volume_high.1x.icon",
+    "system_menu_volume_high.icon",
+    "system_menu_volume_low.1x.icon",
+    "system_menu_volume_low.icon",
+    "system_menu_volume_medium.1x.icon",
+    "system_menu_volume_medium.icon",
+    "system_menu_volume_mute.1x.icon",
+    "system_menu_volume_mute.icon",
     "system_tray_accessibility.1x.icon",
     "system_tray_accessibility.icon",
     "system_tray_battery.1x.icon",
@@ -105,10 +183,14 @@ action("aggregate_vector_icons") {
     "system_tray_caps_lock.icon",
     "system_tray_cast.1x.icon",
     "system_tray_cast.icon",
+    "system_tray_recording.1x.icon",
+    "system_tray_recording.icon",
     "system_tray_rotation_lock_locked.1x.icon",
     "system_tray_rotation_lock_locked.icon",
     "system_tray_screen_share.1x.icon",
     "system_tray_screen_share.icon",
+    "system_tray_tracing.1x.icon",
+    "system_tray_tracing.icon",
     "system_tray_update.1x.icon",
     "system_tray_update.icon",
     "system_tray_volume_mute.1x.icon",
diff --git a/chromium/ash/test/BUILD.gn b/chromium/ash/test/BUILD.gn
new file mode 100644
index 00000000000..7cc551bf5bd
--- /dev/null
+++ b/chromium/ash/test/BUILD.gn
@@ -0,0 +1,212 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+
+# Used to test ash with an aura backend.
+source_set("ash_with_aura_test_support") {
+  testonly = true
+  sources = [
+    "ash_test_impl_aura.cc",
+    "ash_test_impl_aura.h",
+  ]
+  deps = [
+    ":test_support_common",
+    "//ash",
+    "//ash/common/test:test_support",
+    "//base",
+    "//skia",
+    "//ui/aura:test_support",
+    "//ui/display",
+    "//ui/wm",
+  ]
+}
+
+static_library("test_support_without_content") {
+  testonly = true
+  sources = [
+    "ash_test_environment_default.cc",
+  ]
+
+  public_deps = [
+    ":test_support_common",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//skia",
+  ]
+}
+
+static_library("test_support_with_content") {
+  testonly = true
+  sources = [
+    "ash_test_environment_content.cc",
+    "ash_test_environment_content.h",
+    "content/test_shell_content_state.cc",
+    "content/test_shell_content_state.h",
+  ]
+  configs += [ "//build/config:precompiled_headers" ]
+
+  public_deps = [
+    ":test_support_common",
+    "//ash:ash_with_content",
+    "//content/public/browser",
+    "//content/test:test_support",
+    "//skia",
+  ]
+}
+
+# Internal target consumed by |test_support_with_content| and
+# |test_support_without_content|. This target contains all the test support
+# files, with the exception of an implementation of AshTestEnvironment.
+# Consumers of ash should use one of |test_support_with_content| or
+# |test_support_without_content|.
+static_library("test_support_common") {
+  testonly = true
+  visibility = [ ":*" ]
+  sources = [
+    "../shell/toplevel_window.cc",
+    "../shell/toplevel_window.h",
+    "ash_md_test_base.cc",
+    "ash_md_test_base.h",
+    "ash_test_base.cc",
+    "ash_test_base.h",
+    "ash_test_environment.h",
+    "ash_test_helper.cc",
+    "ash_test_helper.h",
+    "ash_test_views_delegate.cc",
+    "ash_test_views_delegate.h",
+    "child_modal_window.cc",
+    "child_modal_window.h",
+    "cursor_manager_test_api.cc",
+    "cursor_manager_test_api.h",
+    "immersive_fullscreen_controller_test_api.cc",
+    "immersive_fullscreen_controller_test_api.h",
+    "lock_state_controller_test_api.cc",
+    "lock_state_controller_test_api.h",
+    "mirror_window_test_api.cc",
+    "mirror_window_test_api.h",
+    "overflow_bubble_view_test_api.cc",
+    "overflow_bubble_view_test_api.h",
+    "shelf_button_pressed_metric_tracker_test_api.cc",
+    "shelf_button_pressed_metric_tracker_test_api.h",
+    "shelf_view_test_api.cc",
+    "shelf_view_test_api.h",
+    "shell_test_api.cc",
+    "shell_test_api.h",
+    "status_area_widget_test_helper.cc",
+    "status_area_widget_test_helper.h",
+    "task_switch_time_tracker_test_api.cc",
+    "task_switch_time_tracker_test_api.h",
+    "test_activation_delegate.cc",
+    "test_activation_delegate.h",
+    "test_keyboard_ui.cc",
+    "test_keyboard_ui.h",
+    "test_overlay_delegate.cc",
+    "test_overlay_delegate.h",
+    "test_screenshot_delegate.cc",
+    "test_screenshot_delegate.h",
+    "test_session_state_animator.cc",
+    "test_session_state_animator.h",
+    "test_shell_delegate.cc",
+    "test_shell_delegate.h",
+    "test_suite.cc",
+    "test_suite.h",
+    "test_suite_init.h",
+    "test_suite_init.mm",
+    "test_system_tray_item.cc",
+    "test_system_tray_item.h",
+    "test_wallpaper_delegate.cc",
+    "test_wallpaper_delegate.h",
+    "ui_controls_factory_ash.cc",
+    "ui_controls_factory_ash.h",
+    "user_metrics_recorder_test_api.cc",
+    "user_metrics_recorder_test_api.h",
+  ]
+  configs += [ "//build/config:precompiled_headers" ]
+
+  public_deps = [
+    "//ash",
+    "//ui/display:display_manager_test_api",
+  ]
+  deps = [
+    "//ash/common/test:test_support",
+    "//ash/public/cpp",
+    "//ash/public/interfaces",
+    "//ash/resources",
+    "//base:i18n",
+    "//base/test:test_support",
+    "//components/signin/core/account_id",
+    "//components/user_manager:user_manager",
+    "//device/bluetooth",
+    "//skia",
+    "//testing/gtest",
+    "//ui/accessibility",
+    "//ui/app_list:test_support",
+    "//ui/app_list/presenter",
+    "//ui/aura",
+    "//ui/aura:test_support",
+    "//ui/base:test_support",
+    "//ui/compositor:test_support",
+    "//ui/display/types",
+    "//ui/events:events_base",
+    "//ui/events:test_support",
+    "//ui/events/devices",
+    "//ui/gl",
+    "//ui/gl:test_support",
+    "//ui/keyboard",
+    "//ui/message_center",
+    "//ui/views",
+    "//ui/views:test_support",
+    "//ui/wm",
+  ]
+
+  if (is_win) {
+    deps += [ "//ui/platform_window/win" ]
+  }
+
+  if (use_x11) {
+    deps += [ "//ui/gfx/x" ]
+  }
+
+  if (is_chromeos) {
+    deps += [
+      "//chromeos",
+      "//ui/display",
+    ]
+
+    sources += [
+      "../laser/laser_pointer_controller_test_api.cc",
+      "../laser/laser_pointer_controller_test_api.h",
+      "../laser/laser_pointer_points_test_api.cc",
+      "../laser/laser_pointer_points_test_api.h",
+      "tray_cast_test_api.cc",
+      "tray_cast_test_api.h",
+    ]
+  }
+}
+
+static_library("interactive_ui_test_support") {
+  testonly = true
+  configs += [ "//build/config:precompiled_headers" ]
+  public_deps = [
+    ":test_support_without_content",
+    "//ash",
+  ]
+  sources = [
+    "ash_interactive_ui_test_base.cc",
+    "ash_interactive_ui_test_base.h",
+  ]
+  deps = [
+    ":test_support_with_content",
+    "//base",
+    "//skia",
+    "//testing/gtest",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/gl:test_support",
+  ]
+}
diff --git a/chromium/ash/touch_hud/mus/BUILD.gn b/chromium/ash/touch_hud/mus/BUILD.gn
index 47aea01ebdb..d9590884e2d 100644
--- a/chromium/ash/touch_hud/mus/BUILD.gn
+++ b/chromium/ash/touch_hud/mus/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 source_set("lib") {
@@ -14,14 +14,15 @@ source_set("lib") {
   ]
 
   deps = [
+    "//ash/public/cpp",
     "//ash/public/interfaces",
     "//ash/touch_hud",
     "//base",
     "//mash/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//ui/views",
@@ -42,8 +43,8 @@ service("touch_hud") {
     ":lib",
     "//base",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
     "//ui/views/mus:for_mojo_application",
   ]