Remove remaining +ash and !ash in chrome/ DEPS

Bug: 798569
Change-Id: I68aa4c7f08458324a6a59aa9cd2d8bfafeb95c99
Reviewed-on: https://chromium-review.googlesource.com/1111024
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570173}

chrome/browser/DEPS

@@ -90,6 +90,8 @@ include_rules = [
   # interfaces in //ash/public/interfaces. See //ash/README.md.
   "-ash",
   "+ash/public",
+  # Ash string IDs can be used in src/chrome.
+  "+ash/strings/grit/ash_strings.h",
   "+ash/components/quick_launch/public/mojom",
   "+ash/components/shortcut_viewer/public/mojom",
   "+ash/components/tap_visualizer/public/mojom",
@@ -220,7 +222,7 @@ specific_include_rules = {
     # Needed for classic mode.
     "+ash/ash_service.h",
   ],
-  # TODO(mash): see bugs 768439 and 768395.
+  # TODO(mash): Fix. https://crbug.com/768439, https://crbug.com/768395.
   "exo_parts\.cc": [
     "+ash/shell.h",
   ],
@@ -229,9 +231,6 @@ specific_include_rules = {
     "+ash/root_window_controller.h",
     "+ash/shell.h",
   ],
-  "display_info_provider_chromeos_unittest.cc": [
-    "+ui/events/devices/touch_device_transform.h"
-  ],
   # TODO(estade): the message center is initialized and shut down here, but it
   # should be the responsibility of code in chrome/browser/notifications/
   "browser_process_impl.cc": [

chrome/browser/chromeos/DEPS

 include_rules = [
-  "-ash",
-  # Public ash interfaces are OK.
-  "+ash/public",
-
   # TODO(ananta): Remove this when we move files which display UI in
   # chrome/browser/chromeos to chrome/browser/ui/views/chromeos
   # crbug.com/728877
@@ -36,12 +32,10 @@ include_rules = [
 specific_include_rules = {
   ".*test.*": [
    "!ash",
-   "+ash/public",
   ],
   "chrome_browser_main_chromeos\.cc": [
     # TODO(mash): Support EventRewriters, http://crbug.com/647781.
     "+ash/events/event_rewriter_controller.h",
-    "+ash/root_window_controller.h",
     "+ash/shell.h",
     "+ash/sticky_keys/sticky_keys_controller.h",
   ],

chrome/browser/chromeos/accessibility/DEPS

-include_rules = [
-  # TODO(crbug.com/756054): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
-]
-
 specific_include_rules = {
+  "accessibility_manager\.cc": [
+    # TODO(mash): Fix. https://crbug.com/594887
+    "+ash/accessibility/accessibility_controller.h",
+    "+ash/root_window_controller.h",
+    "+ash/shell.h",
+    # TODO(mash): Fix. https://crbug.com/647781
+    "+ash/sticky_keys/sticky_keys_controller.h",
+  ],
+  "magnification_manager\.cc": [
+    # TODO(mash): Fix. https://crbug.com/817157
+    "+ash/magnifier/magnification_controller.h",
+    "+ash/shell.h",
+  ],
+  "switch_access_event_handler\.cc": [
+    # TODO(mash): Fix. https://crbug.com/854025
+    "+ash/shell.h",
+  ],
+
+  # Testing
   ".*browsertest\.cc": [
     "+ash/root_window_controller.h",
     "+ash/system/status_area_widget.h",

chrome/browser/chromeos/arc/DEPS

-include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
-]

chrome/browser/chromeos/arc/accessibility/DEPS

+specific_include_rules = {
+  "arc_accessibility_helper_bridge.*": [
+    # TODO(mash): Fix. https://crbug.com/768439.
+    "+ash/system/message_center/arc/arc_notification_surface.h",
+    "+ash/system/message_center/arc/arc_notification_surface_manager.h",
+  ],
+}

chrome/browser/chromeos/arc/boot_phase_monitor/DEPS

+specific_include_rules = {
+  "arc_instance_throttle\.cc": [
+    # TODO(mash): Fix. https://crbug.com/826386.
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+}

chrome/browser/chromeos/arc/screen_capture/DEPS

+specific_include_rules = {
+  # TODO(mash): Fix these. https://crbug.com/557397
+  "arc_screen_capture_bridge\.cc": [
+    "+ash/shell.h",
+  ],
+  "arc_screen_capture_session\.cc": [
+    # To inform Shell that capture is active for cursor compositing.
+    "+ash/shell.h",
+  ],
+}

chrome/browser/chromeos/arc/voice_interaction/DEPS

+specific_include_rules = {
+  "arc_voice_interaction_framework_service\.cc": [
+    # TODO(mash): Fix. https://crbug.com/557397.
+    "+ash/shell.h",
+  ],
+}

chrome/browser/chromeos/display/DEPS

@@ -4,7 +4,8 @@ specific_include_rules = {
     "+ash/display/display_prefs.h",
     "+ash/shell.h",
   ],
-  # TODO(mash): http://crbug.com/839265.
+  # mash-ok, output_protection_controller_ash is not used in mash,
+  # output_protection_controller_mus is used instead.
   "output_protection_controller_ash\.cc": [
     "+ash/shell.h",
   ],

chrome/browser/chromeos/display/output_protection_controller_ash.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/display/output_protection_controller_ash.h"
 
-#include "ash/shell.h"
+#include "ash/shell.h"  // mash-ok
 
 namespace chromeos {
 

chrome/browser/chromeos/input_method/DEPS

 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
   "-chrome",
   "+chrome/browser/chromeos/input_method",
   "+chrome/grit",
@@ -12,30 +7,44 @@ include_rules = [
 
 specific_include_rules = {
   # The configuration layer.
-  '(input_method_delegate_impl|input_method_persistence|browser_state_monitor)'
-  '\.(h|cc)': [
+  "(input_method_delegate_impl|input_method_persistence|browser_state_monitor)"
+  "\.(h|cc)": [
     "+chrome/common",
     "+chrome/browser",
     "+chrome/test",
     "+content/public",
   ],
-  # For testing.
-  '.*(_browsertest|_unittest|_test_helper|)\.(h|cc)': [
-    "+chrome/common",
-    "+chrome/browser",
-    "+chrome/test",
-    "+content/public",
+  # TODO(mash): Fix. https://crbug.com/738531
+  "candidate_window_controller_impl\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+  # TODO(mash): Fix these. https://crbug.com/756059
+  "input_method_engine\.cc": [
+    "+ash/shell.h",
   ],
+  "mode_indicator_controller\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+
   # TODO(erikwright): Bring this list to zero.
-  #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
-  'input_method_manager_impl\.cc': [
+  "input_method_manager_impl\.cc": [
     # TODO(erikwright): Much/all of language_preferences can/should be decoupled
     # from chrome/browser.
     "!chrome/browser/chromeos/language_preferences.h"
   ],
-  'xkeyboard_unittest\.cc': [
+
+  # For testing.
+  ".*(_browsertest|_unittest|_test_helper|)\.(h|cc)": [
+    "+chrome/common",
+    "+chrome/browser",
+    "+chrome/test",
+    "+content/public",
+  ],
+  "xkeyboard_unittest\.cc": [
     "!content/public/test/test_browser_thread.h",
   ],
 }

chrome/browser/chromeos/login/DEPS

 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
-
   "+components/captive_portal",
   "+components/login",
   "+components/toolbar",
@@ -18,6 +12,10 @@ include_rules = [
 ]
 
 specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/648733
+  "app_launch_controller\.cc": [
+    "+ash/shell.h",
+  ],
   "login_browsertest\.cc": [
     "+ash/system/status_area_widget.h",
     "+ash/system/unified/unified_system_tray.h",

chrome/browser/chromeos/login/lock/DEPS

+specific_include_rules = {
+  # TODO(jdufault): This code is deprecated and will be removed.
+  "webui_screen_locker\.h": [
+    "+ash/login/ui/lock_window.h",
+  ],
+}

chrome/browser/chromeos/login/ui/DEPS

@@ -6,3 +6,29 @@ include_rules = [
   # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST!
 ]
 
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/854323
+  "input_events_blocker\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/854328
+  "login_display_host_common\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/854346
+  "webui_login_view.*": [
+     "+ash/accelerators/accelerator_controller.h",
+     "+ash/focus_cycler.h",
+     "+ash/public/cpp/ash_features.h",
+     "+ash/root_window_controller.h",
+     "+ash/shelf/shelf_widget.h",
+     "+ash/shell.h",
+     "+ash/system",
+  ],
+  # TODO(jdufault): Deprecate. https://crbug.com/792654
+  "login_display_host_webui\.cc": [
+    "+ash/accessibility/focus_ring_controller.h",
+    "+ash/shell.h",
+    "+ash/system/tray/system_tray.h",
+  ],
+}

chrome/browser/chromeos/policy/DEPS

 include_rules = [
-  # TODO(crbug.com/678705): Convert to using mojo interfaces in
-  # //ash/public/interfaces and eliminate this.
-  "!ash",
-  # Public interfaces are OK.
-  "+ash/public",
   "+components/feedback",
   "+components/invalidation",
   "+components/user_manager",

chrome/browser/chromeos/system_logs/DEPS

 specific_include_rules = {
-  # TODO(mash): http://crbug.com/581462.
+  # TODO(mash): http://crbug.com/807408.
   "touch_log_source\.cc": [
     "+ash/touch/touch_hud_debug.h",
   ],

chrome/browser/devtools/protocol/DEPS

-include_rules = [
-  "+ash/shell.h",
-  "+ash/wm/overview/window_selector_controller.h",
-]
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/758061
+  "window_manager_handler\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/overview/window_selector_controller.h",
+  ]
+}

chrome/browser/extensions/DEPS

 include_rules = [
-  # Only public interfaces allowed. See //ash/README.md
-  "+ash/public/cpp",
   "+components/chrome_apps",
   "+components/crx_file",
   "+components/strings/grit/components_strings.h",
@@ -17,18 +15,6 @@ include_rules = [
   "+ppapi/shared_impl",
 ]
 specific_include_rules = {
-  "bookmark_app_helper\.cc": [
-    # TODO(mash): Remove. http://crbug.com/678705
-    "+ash/shell.h",
-  ],
-  "display_info_provider_chromeos(|_unittest)\.cc": [
-    # TODO(mash): Remove. http://crbug.com/678705
-    "+ash/display",
-    "+ash/shell.h",
-    "+ash/test",
-    "+ash/touch",
-    "+ash/wm/tablet_mode/tablet_mode_controller.h",
-  ],
   "extension_protocols_unittest\.cc": [
     "+services/network/test",
   ],

chrome/browser/extensions/api/automation/DEPS

-include_rules = [
-  # TODO(mash): Remove. http://crbug.com/678705
-  "+ash/accelerators/accelerator_controller.h",
-  "+ash/shell.h",
-]
+specific_include_rules = {
+  "automation_apitest\.cc": [
+    "+ash/accelerators/accelerator_controller.h",
+    "+ash/shell.h",
+  ]
+}

chrome/browser/extensions/api/virtual_keyboard_private/DEPS

 include_rules = [
-  # TODO(mash): Remove. http://crbug.com/678705
-  "+ash/shell.h",
   "+media/audio"
   "+services/audio/public/cpp"
 ]
+
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/646565
+  "chrome_virtual_keyboard_delegate\.cc": [
+    "+ash/shell.h",
+  ]
+}

chrome/browser/extensions/system_display/DEPS

+specific_include_rules = {
+  # TODO(mash): Remove. http://crbug.com/678705
+  "display_info_provider_chromeos_unittest\.cc": [
+    "+ash/display",
+    "+ash/shell.h",
+    "+ash/test",
+    "+ash/wm/tablet_mode/tablet_mode_controller.h",
+  ],
+}

chrome/browser/media/webrtc/DEPS

 include_rules = [
-  # TODO(mash): Remove. http://crbug.com/723880
-  "+ash/shell.h",
   "+services/audio/public/cpp",
   "+third_party/libyuv",
   "+third_party/webrtc",
 ]
+
 specific_include_rules = {
-  # TODO(mash): Remove. http://crbug.com/723880
+  # TODO(mash): Fix these. https://crbug.com/723880
+  "desktop_capture_access_handler\.cc": [
+    "+ash/shell.h",
+  ],
+  "desktop_media_list_ash\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Fix. https://crbug.com/855147
+  "media_capture_devices_dispatcher\.cc": [
+    "+ash/shell.h",
+  ],
+  # TODO(mash): Remove. https://crbug.com/723880
   ".*_unittest\.cc": [
     "+ash/test/ash_test_base.h",
   ]

chrome/browser/resource_coordinator/DEPS

 include_rules = [
-  # TODO(mash): Remove. http://crbug.com/723881
-  "+ash/shell.h",
   "+services/resource_coordinator/public",
   # No inclusion of WebKit from the browser, other than strictly enum/POD,
   # header-only types, and some selected common code.
   "+third_party/blink/public/platform/web_sudden_termination_disabler_type.h",
 ]
+
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/723881
+  "tab_manager_delegate_chromeos\.cc": [
+    "+ash/shell.h",
+  ],
+}

chrome/browser/ui/DEPS

@@ -13,9 +13,3 @@ include_rules = [
   "+mash/public/mojom",
   "+services/device/public/mojom",
 ]
-
-specific_include_rules = {
-  "browser_command_controller\.cc": [
-    "+ash/accelerators/accelerator_commands_classic.h",
-  ],
-}

chrome/browser/ui/app_list/DEPS

-include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Change this to "-ash".
-  "!ash",
-
-  "+ash/public",
-]

chrome/browser/ui/app_list/arc/DEPS

-include_rules = [
-  # TODO(mash): Remove. http://crbug.com/678705
-  "!ash",
-]

chrome/browser/ui/app_list/search/answer_card/DEPS

+specific_include_rules = {
+  "answer_card_web_contents\.cc": [
+    # TODO(mash): Fix. https://crbug.com/854787
+    "+ash/app_list/views/app_list_view.h",
+  ],
+}
+

chrome/browser/ui/app_list/search/answer_card/answer_card_web_contents.cc

@@ -25,6 +25,7 @@
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "ui/aura/window.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/webview/web_contents_set_background_color.h"
 #include "ui/views/controls/webview/webview.h"
@@ -39,10 +40,12 @@ constexpr char kSearchAnswerHasResult[] = "SearchAnswer-HasResult";
 constexpr char kSearchAnswerIssuedQuery[] = "SearchAnswer-IssuedQuery";
 constexpr char kSearchAnswerTitle[] = "SearchAnswer-Title";
 
+// SearchAnswerWebView is only created in non-mash mode, see comment below.
 class SearchAnswerWebView : public views::WebView {
  public:
   explicit SearchAnswerWebView(content::BrowserContext* browser_context)
       : WebView(browser_context) {
+    DCHECK(::features::IsAshInBrowserProcess());
     holder()->set_can_process_events_within_subtree(false);
   }
 
@@ -162,6 +165,8 @@ AnswerCardWebContents::AnswerCardWebContents(Profile* profile)
   if (rvh)
     AttachToHost(rvh->GetWidget());
 
+  // AnswerCardContentsRegistry::Get() returns null in mash. See
+  // answer_card_contents_registry.h for details.
   if (AnswerCardContentsRegistry::Get()) {
     web_view_ = std::make_unique<SearchAnswerWebView>(profile);
     web_view_->set_owned_by_client();

chrome/browser/ui/ash/DEPS

 include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  "+ash/public",
-
-  # Use //ui/wm/core/window_util.h when manipulating chrome browser windows.
-  # Consult mustash-team@ if you need to manipulate non-browser windows because
-  # those are owned by the ash process under mash. See //ash/README.md.
-  "-ash/wm/window_util.h",
-
   # ash depends on views, so code in ui/ash is allowed to depend on ui/views.
   "+chrome/browser/ui/views",
 
@@ -46,7 +37,7 @@ specific_include_rules = {
   "chrome_new_window_client\.cc": [
     "+ash/content/keyboard_overlay/keyboard_overlay_view.h",
   ],
-  # https://crbug.com/706246
+  # https://crbug.com/557397
   "chrome_screenshot_grabber.*": [
     "+ash/screenshot_delegate.h",
     "+ash/shell.h",
@@ -57,6 +48,7 @@ specific_include_rules = {
     "+ash/accessibility/accessibility_delegate.h",
     # https://crbug.com/557397
     "+ash/screenshot_delegate.h",
+    # https://crbug.com/665064
     "+ash/shell_delegate.h",
   ],
   # For ash::Shell::GetContainer (!mash)

chrome/browser/ui/ash/assistant/web_contents_manager.cc

@@ -135,7 +135,7 @@ class ManagedWebContents : public content::WebContentsDelegate {
 
       std::move(callback).Run(embed_token_.value());
     } else {
-      // TODO(dmblack): Handle Mash case.
+      // TODO(dmblack): Handle Mash case. https://crbug.com/854787.
       std::move(callback).Run(base::nullopt);
     }
   }

chrome/browser/ui/ash/ksv/DEPS

 include_rules = [
-  "-ash"
   "-chrome",
   "+ash/components/shortcut_viewer/public",
+  "+chrome/browser/chromeos/accessibility",
   "+chrome/browser/ui/ash/ksv",
 ]
 
 specific_include_rules = {
+  # mash-ok. https://crbug.com/841020
+  "keyboard_shortcut_viewer_util\.cc": [
+    "+ash/components/shortcut_viewer/views/keyboard_shortcut_view.h",
+  ],
+  # Tests.
   "keyboard_shortcut_viewer_metadata_unittest\.cc": [
     "+ash/components/shortcut_viewer",
     "+chrome/browser/ui/views",
   ],
-  # https://crbug.com/841020
-  "keyboard_shortcut_viewer_util\.cc": [
-    "+ash/components/shortcut_viewer/views/keyboard_shortcut_view.h",
-    "+ash/public/cpp",
-  ],
 }

chrome/browser/ui/ash/launcher/DEPS

@@ -3,9 +3,8 @@ specific_include_rules = {
   "app_window_launcher_controller\.cc": [
     "+ash/shell.h",
   ],
-  # https://crbug.com/557406
+  # TODO(mash): Fix. https://crbug.com/826391
   "chrome_launcher_controller\.cc": [
     "+ash/shell.h",
-    "+ash/strings/grit/ash_strings.h",
   ],
 }

chrome/browser/ui/ash/multi_user/DEPS

 specific_include_rules = {
-  # For Shell::tablet_mode_controller() (!mash)
+  # mash-ok. For Shell::tablet_mode_controller() (!mash)
   "multi_user_window_manager_chromeos\.cc": [
     "+ash/shell.h",
     "+ash/wm/tablet_mode/tablet_mode_controller.h",

chrome/browser/ui/ash/network/DEPS

@@ -3,11 +3,7 @@ include_rules = [
 ]
 
 specific_include_rules = {
-  # https://crbug.com/826370
-  "tether_notification_presenter\.h": [
-    "+ash/system/network/network_icon.h",
-  ],
-  # https://crbug.com/651157
+  # TODO(mash): Fix. https://crbug.com/651157
   "networking_config_delegate_chromeos\.h": [
     "+ash/system/networking_config_delegate.h",
   ],

chrome/browser/ui/aura/accessibility/DEPS

-include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Remove. http://crbug.com/678705
-  "!ash",
-
-  "+ash/public",
-]
+specific_include_rules = {
+  "automation_manager_aura\.cc": [
+    # TODO(mash): Fix. https://crbug.com/756054
+    "+ash/shell.h",
+    "+ash/wm/window_util.h",
+  ],
+}

chrome/browser/ui/aura/accessibility/automation_manager_aura.cc

@@ -29,8 +29,8 @@
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/shell.h"           // nogncheck
-#include "ash/wm/window_util.h"  // nogncheck
+#include "ash/shell.h"
+#include "ash/wm/window_util.h"
 #include "components/session_manager/core/session_manager.h"
 #include "ui/base/ui_base_features.h"
 #endif

chrome/browser/ui/toolbar/DEPS

-include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Remove. http://crbug.com/678705
-  "!ash",
-
-  "+ash/public",
-]

chrome/browser/ui/views/DEPS

 include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Remove. http://crbug.com/678705
- "!ash",
-
- "+ash/components/quick_launch/public",
- "+ash/public",
  "+chrome/browser/ui/views",
  "+components/constrained_window",
  "+mash/common",
@@ -13,3 +6,25 @@ include_rules = [
  "+components/user_manager",
  "+third_party/libaddressinput",
 ]
+
+specific_include_rules = {
+  "chrome_views_delegate_chromeos\.cc": [
+    # TODO(mash): Fix. https://crbug.com/631545
+    "+ash/accelerators/accelerator_controller.h",
+    # TODO(mash): Fix. https://crbug.com/826456
+    "+ash/shell.h",
+    "+ash/wm/window_state.h",
+  ],
+  # mash-ok
+  "screen_capture_notification_ui_views\.cc": [
+    "+ash/shell.h",
+  ],
+  # mash-ok
+  "status_bubble_views\.cc": [
+    "+ash/shell.h",
+    "+ash/wm/window_state.h",
+  ],
+  ".*test.*": [
+   "!ash",
+  ],
+}

chrome/browser/ui/views/apps/DEPS

 include_rules = [
  "+extensions/components/native_app_window"
 ]
+
+specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/855096
+  "chrome_native_app_window_views_aura_ash\.cc": [
+    "+ash/frame/custom_frame_view_ash.h",
+    "+ash/wm/window_properties.h",
+    "+ash/wm/window_state.h",
+    "+ash/wm/window_state_delegate.h",
+  ],
+}

chrome/browser/ui/views/frame/DEPS

@@ -3,4 +3,7 @@ specific_include_rules = {
   "browser_non_client_frame_view_ash\.*": [
     "+ash",
   ],
+  "browser_frame_ash\.*": [
+    "+ash",
+  ],
 }

chrome/browser/ui/views/tabs/DEPS

+specific_include_rules = {
+  # mash-ok. Mash uses window_finder_mus.cc instead of window_finder_ash.cc.
+  "window_finder_ash\.cc": [
+    "+ash/wm/root_window_finder.h",
+  ],
+}

chrome/browser/ui/views/tabs/window_finder_ash.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/views/tabs/window_finder.h"
 
 // The direct usage of //ash/ is fine here, as this code is only executed in
-// classic ash. See //c/b/u/v/tabs/window_finder_chromeos.h.
+// classic ash. See window_finder_chromeos.cc.
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/root_window_finder.h"  // mash-ok
 #include "ui/aura/client/screen_position_client.h"

chrome/browser/ui/views/touch_uma/DEPS

+specific_include_rules = {
+  # TODO(mash): https://crbug.com/826476
+  "touch_uma_ash\.cc": [
+    "+ash/touch/touch_uma.h",
+  ],
+}

chrome/browser/ui/webui/chromeos/emulator/DEPS

 specific_include_rules = {
   "device_emulator_message_handler\.cc": [
-    # TODO(mash): Remove. http://crbug.com/770866
+    # TODO(mash): Remove. http://crbug.com/756094
     "+ash/shell.h",
     "+ash/system/bluetooth/tray_bluetooth_helper.h",
   ],

chrome/browser/ui/webui/chromeos/login/DEPS

-# TODO(mash): Remove ash includes. http://crbug.com/770866
 specific_include_rules = {
+  # TODO(mash): Fix. https://crbug.com/770866
   "core_oobe_handler\.cc": [
     "+ash/shell.h",
   ],
@@ -7,6 +7,16 @@ specific_include_rules = {
     "+ash/display/window_tree_host_manager.h",
     "+ash/shell.h",
   ],
+  # TODO(mash): Fix. https://crbug.com/678990
+  "signin_screen_handler\.cc": [
+    "+ash/detachable_base",
+    "+ash/shell.h",
+  ],
+  "signin_screen_handler\.h": [
+    "+ash/detachable_base/detachable_base_observer.h",
+  ],
+
+  # Tests.
   "oobe_display_chooser_browsertest\.cc": [
     "+ash/shell.h",
   ],
@@ -17,13 +27,6 @@ specific_include_rules = {
     # TODO(mash): Remove. http://crbug.com/720917.
     "+ui/events/devices/device_data_manager.h",
   ],
-  "signin_screen_handler\.cc": [
-    "+ash/detachable_base",
-    "+ash/shell.h",
-  ],
-  "signin_screen_handler\.h": [
-    "+ash/detachable_base/detachable_base_observer.h",
-  ],
   "signin_userlist_unittest\.cc": [
     "+ash/test/ash_test_base.h"
   ],

chrome/browser/ui/window_sizer/DEPS

-include_rules = [
-  # Code under //ash runs out-of-process in mash so it must be accessed via mojo
-  # interfaces in //ash/public/interfaces. See //ash/README.md.
-  # TODO(mash): Remove. http://crbug.com/678705
-  "!ash",
-
-  "+ash/public",
-]
+specific_include_rules = {
+  ".*test.*": [
+   "!ash",
+   "+ash/public",
+  ],
+}