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

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

Bug: 1042208
Change-Id: I679be34e3d05dfe6b33245832224331226169c38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017467Reviewed-by: Danyao Wang <danyao@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735290}

ios/chrome/browser/payments/ios_can_make_payment_query_factory.cc

@@ -20,7 +20,7 @@ IOSCanMakePaymentQueryFactory* IOSCanMakePaymentQueryFactory::GetInstance() {
 // static
 payments::CanMakePaymentQuery*
 IOSCanMakePaymentQueryFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<payments::CanMakePaymentQuery*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }

ios/chrome/browser/payments/ios_can_make_payment_query_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 payments {
 class CanMakePaymentQuery;
@@ -22,7 +23,7 @@ class IOSCanMakePaymentQueryFactory : public BrowserStateKeyedServiceFactory {
  public:
   static IOSCanMakePaymentQueryFactory* GetInstance();
   static payments::CanMakePaymentQuery* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
  private:
   friend class base::NoDestructor<IOSCanMakePaymentQueryFactory>;

ios/chrome/browser/payments/ios_payment_instrument_launcher_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 payments {
 class IOSPaymentInstrumentLauncher;
@@ -21,7 +22,7 @@ class IOSPaymentInstrumentLauncherFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static IOSPaymentInstrumentLauncher* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
   static IOSPaymentInstrumentLauncherFactory* GetInstance();
 
  private:

ios/chrome/browser/payments/ios_payment_instrument_launcher_factory.mm

@@ -20,7 +20,7 @@ namespace payments {
 // static
 payments::IOSPaymentInstrumentLauncher*
 IOSPaymentInstrumentLauncherFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<payments::IOSPaymentInstrumentLauncher*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }

ios/chrome/browser/payments/ios_payment_request_cache_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 payments {
 class PaymentRequestCache;
@@ -21,7 +22,7 @@ class PaymentRequestCache;
 class IOSPaymentRequestCacheFactory : public BrowserStateKeyedServiceFactory {
  public:
   static PaymentRequestCache* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
   static IOSPaymentRequestCacheFactory* GetInstance();
 
  private:

ios/chrome/browser/payments/ios_payment_request_cache_factory.mm

@@ -20,7 +20,7 @@ namespace payments {
 // static
 payments::PaymentRequestCache*
 IOSPaymentRequestCacheFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<payments::PaymentRequestCache*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }

ios/chrome/browser/payments/payment_request.h

@@ -22,11 +22,12 @@
 #include "components/payments/core/payment_request_base_delegate.h"
 #include "components/payments/core/payments_profile_comparator.h"
 #include "components/payments/core/web_payment_request.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/payments/ios_payment_instrument_finder.h"
 #import "ios/chrome/browser/payments/payment_response_helper.h"
 #include "url/gurl.h"
 
+class ChromeBrowserState;
+
 namespace autofill {
 class AddressNormalizer;
 class AutofillProfile;
@@ -94,7 +95,7 @@ class PaymentRequest : public PaymentOptionsProvider,
 
   // |personal_data_manager| should not be null and should outlive this object.
   PaymentRequest(const payments::WebPaymentRequest& web_payment_request,
-                 ios::ChromeBrowserState* browser_state,
+                 ChromeBrowserState* browser_state,
                  web::WebState* web_state,
                  autofill::PersonalDataManager* personal_data_manager,
                  id<PaymentRequestUIDelegate> payment_request_ui_delegate);
@@ -376,7 +377,7 @@ class PaymentRequest : public PaymentOptionsProvider,
   payments::WebPaymentRequest web_payment_request_;
 
   // Never null and outlives this object.
-  ios::ChromeBrowserState* browser_state_;
+  ChromeBrowserState* browser_state_;
 
   // Never null and outlives this object.
   web::WebState* web_state_;

ios/chrome/browser/payments/payment_request.mm

@@ -80,7 +80,7 @@ void PopulateValidatedMethodData(
 
 PaymentRequest::PaymentRequest(
     const payments::WebPaymentRequest& web_payment_request,
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     web::WebState* web_state,
     autofill::PersonalDataManager* personal_data_manager,
     id<PaymentRequestUIDelegate> payment_request_ui_delegate)

ios/chrome/browser/payments/test_payment_request.h

@@ -8,9 +8,10 @@
 #include "base/macros.h"
 #include "components/autofill/core/browser/address_normalization_manager.h"
 #include "components/autofill/core/browser/test_address_normalizer.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 
+class ChromeBrowserState;
+
 namespace autofill {
 class PersonalDataManager;
 class RegionDataLoader;
@@ -35,13 +36,13 @@ class TestPaymentRequest : public PaymentRequest {
   // |browser_state|, |web_state|, and |personal_data_manager| should not be
   // null and should outlive this object.
   TestPaymentRequest(const payments::WebPaymentRequest& web_payment_request,
-                     ios::ChromeBrowserState* browser_state,
+                     ChromeBrowserState* browser_state,
                      web::WebState* web_state,
                      autofill::PersonalDataManager* personal_data_manager,
                      id<PaymentRequestUIDelegate> payment_request_ui_delegate);
 
   TestPaymentRequest(const payments::WebPaymentRequest& web_payment_request,
-                     ios::ChromeBrowserState* browser_state,
+                     ChromeBrowserState* browser_state,
                      web::WebState* web_state,
                      autofill::PersonalDataManager* personal_data_manager);
 

ios/chrome/browser/payments/test_payment_request.mm

@@ -19,7 +19,7 @@ namespace payments {
 
 TestPaymentRequest::TestPaymentRequest(
     const payments::WebPaymentRequest& web_payment_request,
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     web::WebState* web_state,
     autofill::PersonalDataManager* personal_data_manager,
     id<PaymentRequestUIDelegate> payment_request_ui_delegate)
@@ -36,7 +36,7 @@ TestPaymentRequest::TestPaymentRequest(
 
 TestPaymentRequest::TestPaymentRequest(
     const payments::WebPaymentRequest& web_payment_request,
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     web::WebState* web_state,
     autofill::PersonalDataManager* personal_data_manager)
     : TestPaymentRequest(web_payment_request,