Eliminate some includes that violate specific_include_rules in DEPS

Change-Id: Ie673d63862039d35a1c769db62c5d59562d4fde9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850725
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704449}

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -11,13 +11,13 @@
 #include "ash/public/cpp/frame_header.h"
 #include "ash/public/cpp/immersive/immersive_fullscreen_controller_test_api.h"
 #include "ash/public/cpp/shelf_test_api.h"
+#include "ash/public/cpp/split_view_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/public/cpp/window_pin_type.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/public/mojom/constants.mojom.h"
 #include "ash/shell.h"                                  // mash-ok
 #include "ash/wm/overview/overview_controller.h"        // mash-ok
-#include "ash/wm/splitview/split_view_controller.h"     // mash-ok
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"  // mash-ok
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
@@ -1280,8 +1280,8 @@ IN_PROC_BROWSER_TEST_P(BrowserNonClientFrameViewAshTest,
   EXPECT_FALSE(frame_view->caption_button_container_->GetVisible());
   EndOverview();
   EXPECT_FALSE(frame_view->caption_button_container_->GetVisible());
-  ash::Shell::Get()->split_view_controller()->SnapWindow(
-      widget->GetNativeWindow(), ash::SplitViewController::LEFT);
+  ash::SplitViewTestApi().SnapWindow(widget->GetNativeWindow(),
+                                     ash::SplitViewTestApi::SnapPosition::LEFT);
   EXPECT_FALSE(frame_view->caption_button_container_->GetVisible());
 }
 
@@ -1316,8 +1316,8 @@ IN_PROC_BROWSER_TEST_P(BrowserNonClientFrameViewAshTest,
   EndOverview();
   EXPECT_TRUE(frame_view2->caption_button_container_->GetVisible());
 
-  ash::Shell::Get()->split_view_controller()->SnapWindow(
-      widget2->GetNativeWindow(), ash::SplitViewController::RIGHT);
+  ash::SplitViewTestApi().SnapWindow(
+      widget2->GetNativeWindow(), ash::SplitViewTestApi::SnapPosition::RIGHT);
   EXPECT_TRUE(frame_view2->caption_button_container_->GetVisible());
 }
 

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

@@ -81,10 +81,10 @@
 #if defined(OS_CHROMEOS)
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/cpp/immersive/immersive_fullscreen_controller_test_api.h"
+#include "ash/public/cpp/split_view_test_api.h"
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
-#include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
@@ -2268,8 +2268,8 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
 
   // Right snap the browser window.
   aura::Window* window = browser()->window()->GetNativeWindow();
-  ash::Shell::Get()->split_view_controller()->SnapWindow(
-      window, ash::SplitViewController::RIGHT);
+  ash::SplitViewTestApi().SnapWindow(
+      window, ash::SplitViewTestApi::SnapPosition::RIGHT);
   EXPECT_NE(gfx::Point(), window->GetBoundsInScreen().origin());
 
   DragWindowAndVerifyOffset(this, GetTabStripForBrowser(browser()), 0);