[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/language

The ChromeBrowserState has been moved from the "ios" namespace
to the global namespace by http://crrev.com/c/2014913. Fix the
uses from ios::ChromeBrowserState to ChromeBrowserState.

Also remove includes of chrome_browser_state_forward.h and use
a simple forward declaration instead (since the old name is no
longer necessary).

This CL was uploaded by git cl split.

R=anthonyvd@chromium.org

Bug: 1042208
Change-Id: I5ca57bdf47c642ea8e4acbae99e47d58405f35c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017404
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736298}

ios/chrome/browser/language/language_model_manager_factory.cc

@@ -22,7 +22,7 @@
 
 namespace {
 
-void PrepareLanguageModels(ios::ChromeBrowserState* const chrome_state,
+void PrepareLanguageModels(ChromeBrowserState* const chrome_state,
                            language::LanguageModelManager* const manager) {
   // Create and set the primary Language Model to use based on the state of
   // experiments.
@@ -68,7 +68,7 @@ LanguageModelManagerFactory* LanguageModelManagerFactory::GetInstance() {
 
 // static
 language::LanguageModelManager* LanguageModelManagerFactory::GetForBrowserState(
-    ios::ChromeBrowserState* const state) {
+    ChromeBrowserState* const state) {
   return static_cast<language::LanguageModelManager*>(
       GetInstance()->GetServiceForBrowserState(state, true));
 }
@@ -83,8 +83,8 @@ LanguageModelManagerFactory::~LanguageModelManagerFactory() {}
 std::unique_ptr<KeyedService>
 LanguageModelManagerFactory::BuildServiceInstanceFor(
     web::BrowserState* const state) const {
-  ios::ChromeBrowserState* const chrome_state =
-      ios::ChromeBrowserState::FromBrowserState(state);
+  ChromeBrowserState* const chrome_state =
+      ChromeBrowserState::FromBrowserState(state);
   std::unique_ptr<language::LanguageModelManager> manager =
       std::make_unique<language::LanguageModelManager>(
           chrome_state->GetPrefs(),

ios/chrome/browser/language/language_model_manager_factory.h

@@ -11,7 +11,8 @@
 #include "base/no_destructor.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace language {
 class LanguageModelManager;
@@ -27,7 +28,7 @@ class LanguageModelManagerFactory : public BrowserStateKeyedServiceFactory {
  public:
   static LanguageModelManagerFactory* GetInstance();
   static language::LanguageModelManager* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
  private:
   friend class base::NoDestructor<LanguageModelManagerFactory>;

ios/chrome/browser/language/language_model_manager_factory_unittest.cc

@@ -25,7 +25,7 @@ TEST_F(LanguageModelManagerFactoryTest, SharedWithIncognito) {
       LanguageModelManagerFactory::GetForBrowserState(state.get());
   EXPECT_THAT(manager, Not(IsNull()));
 
-  ios::ChromeBrowserState* const incognito =
+  ChromeBrowserState* const incognito =
       state->GetOffTheRecordChromeBrowserState();
   ASSERT_THAT(incognito, Not(IsNull()));
   EXPECT_THAT(LanguageModelManagerFactory::GetForBrowserState(incognito),

ios/chrome/browser/language/url_language_histogram_factory.cc

@@ -18,7 +18,7 @@ UrlLanguageHistogramFactory* UrlLanguageHistogramFactory::GetInstance() {
 
 // static
 language::UrlLanguageHistogram* UrlLanguageHistogramFactory::GetForBrowserState(
-    ios::ChromeBrowserState* const state) {
+    ChromeBrowserState* const state) {
   return static_cast<language::UrlLanguageHistogram*>(
       GetInstance()->GetServiceForBrowserState(state, true));
 }
@@ -33,8 +33,8 @@ UrlLanguageHistogramFactory::~UrlLanguageHistogramFactory() {}
 std::unique_ptr<KeyedService>
 UrlLanguageHistogramFactory::BuildServiceInstanceFor(
     web::BrowserState* const context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<language::UrlLanguageHistogram>(
       browser_state->GetPrefs());
 }

ios/chrome/browser/language/url_language_histogram_factory.h

@@ -11,7 +11,8 @@
 #include "base/no_destructor.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace language {
 class UrlLanguageHistogram;
@@ -25,7 +26,7 @@ class UrlLanguageHistogramFactory : public BrowserStateKeyedServiceFactory {
  public:
   static UrlLanguageHistogramFactory* GetInstance();
   static language::UrlLanguageHistogram* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
  private:
   friend class base::NoDestructor<UrlLanguageHistogramFactory>;

ios/chrome/browser/language/url_language_histogram_factory_unittest.cc

@@ -22,7 +22,7 @@ class UrlLanguageHistogramFactoryTest : public PlatformTest {
 
   ~UrlLanguageHistogramFactoryTest() override { chrome_browser_state_.reset(); }
 
-  ios::ChromeBrowserState* chrome_browser_state() {
+  ChromeBrowserState* chrome_browser_state() {
     return chrome_browser_state_.get();
   }
 
@@ -36,7 +36,7 @@ TEST_F(UrlLanguageHistogramFactoryTest, NotCreatedInIncognito) {
       UrlLanguageHistogramFactory::GetForBrowserState(chrome_browser_state()),
       Not(IsNull()));
 
-  ios::ChromeBrowserState* otr_browser_state =
+  ChromeBrowserState* otr_browser_state =
       chrome_browser_state()->GetOffTheRecordChromeBrowserState();
   language::UrlLanguageHistogram* language_histogram =
       UrlLanguageHistogramFactory::GetForBrowserState(otr_browser_state);