[ios] Clean up support code after moving ChromeBrowserState

As ChromeBrowserState has been moved to the global namespace and
all client code fixed, the code added to support the incremental
migration can be removed.

Bug: 1042208
Change-Id: I35a69dfcf6256f0990ec3b3deeb847fa3a7c4ab2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026976Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736909}

ios/chrome/app/spotlight/BUILD.gn

@@ -30,7 +30,6 @@ source_set("spotlight") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/suggestions",

ios/chrome/browser/browser_state/BUILD.gn

@@ -2,10 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("forward") {
-  sources = [ "chrome_browser_state_forward.h" ]
-}
-
 source_set("browser_state") {
   sources = [
     "browser_state_otr_helper.cc",
@@ -16,7 +12,6 @@ source_set("browser_state") {
   ]
 
   public_deps = [
-    ":forward",
     "//ios/web",
     "//net",
   ]

ios/chrome/browser/browser_state/chrome_browser_state.h

@@ -131,9 +131,4 @@ class ChromeBrowserState : public web::BrowserState {
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserState);
 };
 
-namespace ios {
-using ::ChromeBrowserState;
-using ::ChromeBrowserStateType;
-}  // namespace ios
-
 #endif  // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_H_

ios/chrome/browser/browser_state/chrome_browser_state_forward.h

-// Copyright 2020 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.
-
-#ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_FORWARD_H_
-#define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_FORWARD_H_
-
-// This file is there to help move ChromeBrowserState to the global
-// namespace (i.e. rename it to ChromeBrowserState).
-
-class ChromeBrowserState;
-enum class ChromeBrowserStateType;
-
-namespace ios {
-using ::ChromeBrowserState;
-using ::ChromeBrowserStateType;
-}  // namespace ios
-
-#endif  // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_FORWARD_H_

ios/chrome/browser/tabs/BUILD.gn

@@ -18,7 +18,6 @@ source_set("tabs") {
   deps = [
     "//components/sessions",
     "//components/sync_sessions",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/web_state_list",

ios/chrome/browser/ui/commands/BUILD.gn

@@ -43,7 +43,6 @@ source_set("commands") {
     "//components/browsing_data/core",
     "//components/password_manager/core/browser",
     "//components/signin/public/base",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/browsing_data:browsing_data_remove_mask",
   ]
 }

ios/chrome/browser/ui/coordinators/BUILD.gn

@@ -12,7 +12,6 @@ source_set("chrome_coordinators") {
 
   deps = [
     "//base",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/main:public",
   ]
 }

ios/chrome/browser/ui/fullscreen/BUILD.gn

@@ -22,7 +22,6 @@ source_set("fullscreen") {
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
   ]

ios/chrome/browser/ui/infobars/coordinators/BUILD.gn

@@ -22,7 +22,6 @@ source_set("coordinators") {
     "//components/infobars/core",
     "//components/translate/core/browser",
     "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/passwords:infobar_delegates",

ios/chrome/browser/ui/main/BUILD.gn

@@ -9,7 +9,6 @@ source_set("scene_guts") {
   deps = [
     "//ios/chrome/app/application_delegate:application_delegate_internal",
     "//ios/chrome/browser:utils",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
   ]

ios/chrome/browser/ui/main/test/BUILD.gn

@@ -10,8 +10,5 @@ source_set("test") {
     "stub_browser_interface_provider.h",
     "stub_browser_interface_provider.mm",
   ]
-  deps = [
-    "//ios/chrome/browser/browser_state:forward",
-    "//ios/chrome/browser/ui/main",
-  ]
+  deps = [ "//ios/chrome/browser/ui/main" ]
 }

ios/chrome/browser/ui/overscroll_actions/BUILD.gn

@@ -23,7 +23,6 @@ source_set("overscroll_actions") {
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/app/theme",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/fullscreen",

ios/chrome/browser/ui/settings/clear_browsing_data/browsing_data_counter_wrapper_producer.h

@@ -5,9 +5,10 @@
 #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_BROWSING_DATA_COUNTER_WRAPPER_PRODUCER_H_
 #define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_BROWSING_DATA_COUNTER_WRAPPER_PRODUCER_H_
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #include "ios/chrome/browser/browsing_data/browsing_data_counter_wrapper.h"
 
+class ChromeBrowserState;
+
 // ClearBrowsingDataManager's dependency on creating BrowsingDataCounterWrapper
 @interface BrowsingDataCounterWrapperProducer : NSObject
 

ios/chrome/browser/web_state_list/web_usage_enabler/BUILD.gn

@@ -17,7 +17,6 @@ source_set("web_usage_enabler") {
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/chrome/browser/web_state_list",
   ]
 }

ios/public/provider/chrome/browser/BUILD.gn

@@ -20,7 +20,6 @@ source_set("browser") {
     "//base",
     "//components/metrics",
     "//ios//web/public",
-    "//ios/chrome/browser/browser_state:forward",
     "//ios/public/provider/chrome/browser/mailto",
   ]
   libs = [ "CoreLocation.framework" ]

ios/public/provider/chrome/browser/DEPS

@@ -10,8 +10,4 @@ include_rules = [
   # Do not allow inclusion of forwarding header in the provider code as the
   # provider is not allowed to depends on //ios/chrome.
   "-ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h",
-
-  # To allow moving ChromeBrowserState to the global namespace, permit the
-  # use of chrome_browser_state_forward.h.
-  "+ios/chrome/browser/browser_state/chrome_browser_state_forward.h",
 ]

ios/public/provider/chrome/browser/mailto/BUILD.gn

@@ -8,10 +8,7 @@ source_set("mailto") {
     "mailto_handler_provider.h",
     "mailto_handler_provider.mm",
   ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser/browser_state:forward",
-  ]
+  deps = [ "//base" ]
 }
 
 source_set("test_support") {

ios/public/provider/chrome/browser/signin/BUILD.gn

@@ -20,7 +20,6 @@ source_set("signin") {
   deps = [
     "//base",
     "//google_apis",
-    "//ios/chrome/browser/browser_state:forward",
   ]
 }
 

ios/public/provider/chrome/browser/voice/BUILD.gn

@@ -16,10 +16,7 @@ source_set("voice") {
     "voice_search_provider.h",
     "voice_search_provider.mm",
   ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser/browser_state:forward",
-  ]
+  deps = [ "//base" ]
 }
 
 source_set("test_support") {