Ash include and vector item cleanup in src/chrome

This CL removes some unneeded ash includes and fixes the only ash
vector icon dependency in src/chrome.

Bug: 798569
Change-Id: I17acd7fb17dc5716f639606b7da31f7e123a13ad
Reviewed-on: https://chromium-review.googlesource.com/1110997Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570060}

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

@@ -7,7 +7,6 @@
 #include <memory>
 #include <utility>
 
-#include "ash/shell.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/camera_detector.h"
 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"

chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h"
 
-#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shell.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"

chrome/browser/chromeos/login/ui/webui_login_view.cc

@@ -351,10 +351,6 @@ void WebUILoginView::LoadURL(const GURL& url) {
   if (!is_reusing_webview_)
     web_view()->LoadInitialURL(url);
   web_view()->RequestFocus();
-
-  // There is no Shell instance while running in mash.
-  if (!features::IsAshInBrowserProcess())
-    return;
 }
 
 content::WebUI* WebUILoginView::GetWebUI() {

chrome/browser/ui/app_list/arc/arc_app_utils.cc

@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 
-#include "ash/shell.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -280,7 +279,7 @@ bool LaunchAppWithIntent(content::BrowserContext* context,
     arc::ArcBootPhaseMonitorBridge::RecordFirstAppLaunchDelayUMA(context);
     ChromeLauncherController* chrome_controller =
         ChromeLauncherController::instance();
-    DCHECK(chrome_controller || !ash::Shell::HasInstance());
+    // chrome_controller may be null in tests.
     if (chrome_controller) {
       chrome_controller->GetShelfSpinnerController()->AddSpinnerToShelf(
           app_id, std::make_unique<ArcShelfSpinnerItemController>(

chrome/browser/ui/app_list/search/settings_shortcut/settings_shortcut_metadata.cc

@@ -4,8 +4,8 @@
 
 #include "chrome/browser/ui/app_list/search/settings_shortcut/settings_shortcut_metadata.h"
 
-#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/no_destructor.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 
@@ -21,7 +21,7 @@ const std::vector<SettingsShortcut>& GetSettingsShortcutList() {
   static const base::NoDestructor<std::vector<SettingsShortcut>>
       settings_shortcuts(
           {{kSettingsShortcutIDBluetooth, IDS_LAUNCHER_SHORTCUTS_BLUETOOTH,
-            ash::kSystemMenuBluetoothIcon, chrome::kBluetoothSubPage,
+            kBluetoothIcon, chrome::kBluetoothSubPage,
             /*searchable_string_resource_id=*/0}});
   return *settings_shortcuts;
 }