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

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=hajimehoshi@chromium.org

Bug: 1042208
Change-Id: I2a3cbcc3f4c23d7ad4c644dc5cb73e0d1a9bddd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017422Reviewed-by: Hajime Hoshi <hajimehoshi@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735271}

ios/chrome/browser/translate/chrome_ios_translate_client.mm

@@ -61,10 +61,10 @@ ChromeIOSTranslateClient::ChromeIOSTranslateClient(web::WebState* web_state)
       translate_manager_(std::make_unique<translate::TranslateManager>(
           this,
           translate::TranslateRankerFactory::GetForBrowserState(
-              ios::ChromeBrowserState::FromBrowserState(
+              ChromeBrowserState::FromBrowserState(
                   web_state->GetBrowserState())),
           LanguageModelManagerFactory::GetForBrowserState(
-              ios::ChromeBrowserState::FromBrowserState(
+              ChromeBrowserState::FromBrowserState(
                   web_state->GetBrowserState()))
               ->GetPrimaryModel())),
       translate_driver_(web_state,
@@ -136,16 +136,16 @@ translate::IOSTranslateDriver* ChromeIOSTranslateClient::GetTranslateDriver() {
 
 PrefService* ChromeIOSTranslateClient::GetPrefs() {
   DCHECK(web_state_);
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
   return chrome_browser_state->GetOriginalChromeBrowserState()->GetPrefs();
 }
 
 std::unique_ptr<translate::TranslatePrefs>
 ChromeIOSTranslateClient::GetTranslatePrefs() {
   DCHECK(web_state_);
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
   return CreateTranslatePrefs(chrome_browser_state->GetPrefs());
 }
 
@@ -153,7 +153,7 @@ translate::TranslateAcceptLanguages*
 ChromeIOSTranslateClient::GetTranslateAcceptLanguages() {
   DCHECK(web_state_);
   return TranslateAcceptLanguagesFactory::GetForBrowserState(
-      ios::ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState()));
+      ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState()));
 }
 
 int ChromeIOSTranslateClient::GetInfobarIconID() const {

ios/chrome/browser/translate/translate_accept_languages_factory.cc

@@ -51,8 +51,7 @@ TranslateAcceptLanguagesFactory::GetInstance() {
 
 // static
 translate::TranslateAcceptLanguages*
-TranslateAcceptLanguagesFactory::GetForBrowserState(
-    ios::ChromeBrowserState* state) {
+TranslateAcceptLanguagesFactory::GetForBrowserState(ChromeBrowserState* state) {
   TranslateAcceptLanguagesService* service =
       static_cast<TranslateAcceptLanguagesService*>(
           GetInstance()->GetServiceForBrowserState(state, true));
@@ -71,8 +70,8 @@ TranslateAcceptLanguagesFactory::~TranslateAcceptLanguagesFactory() {
 std::unique_ptr<KeyedService>
 TranslateAcceptLanguagesFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<TranslateAcceptLanguagesService>(
       browser_state->GetPrefs());
 }

ios/chrome/browser/translate/translate_accept_languages_factory.h

@@ -10,7 +10,8 @@
 #include "base/macros.h"
 #include "base/no_destructor.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 translate {
 class TranslateAcceptLanguages;
@@ -21,7 +22,7 @@ class TranslateAcceptLanguages;
 class TranslateAcceptLanguagesFactory : public BrowserStateKeyedServiceFactory {
  public:
   static translate::TranslateAcceptLanguages* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
   static TranslateAcceptLanguagesFactory* GetInstance();
 
  private:

ios/chrome/browser/translate/translate_ranker_factory.cc

@@ -22,7 +22,7 @@ TranslateRankerFactory* TranslateRankerFactory::GetInstance() {
 
 // static
 translate::TranslateRanker* TranslateRankerFactory::GetForBrowserState(
-    ios::ChromeBrowserState* state) {
+    ChromeBrowserState* state) {
   return static_cast<TranslateRanker*>(
       GetInstance()->GetServiceForBrowserState(state, true));
 }
@@ -36,8 +36,8 @@ TranslateRankerFactory::~TranslateRankerFactory() {}
 
 std::unique_ptr<KeyedService> TranslateRankerFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<TranslateRankerImpl>(
       TranslateRankerImpl::GetModelPath(browser_state->GetStatePath()),
       TranslateRankerImpl::GetModelURL(),

ios/chrome/browser/translate/translate_ranker_factory.h

@@ -10,7 +10,8 @@
 #include "base/macros.h"
 #include "base/no_destructor.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 translate {
 
@@ -21,7 +22,7 @@ class TranslateRanker;
 class TranslateRankerFactory : public BrowserStateKeyedServiceFactory {
  public:
   static translate::TranslateRanker* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
   static TranslateRankerFactory* GetInstance();
 
  private:

ios/chrome/browser/translate/translate_ranker_metrics_provider.cc

@@ -17,7 +17,7 @@ namespace translate {
 
 void TranslateRankerMetricsProvider::ProvideCurrentSessionData(
     metrics::ChromeUserMetricsExtension* uma_proto) {
-  std::vector<ios::ChromeBrowserState*> browser_states =
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
@@ -35,7 +35,7 @@ void TranslateRankerMetricsProvider::ProvideCurrentSessionData(
 }
 
 void TranslateRankerMetricsProvider::UpdateLoggingState() {
-  std::vector<ios::ChromeBrowserState*> browser_states =
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();