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

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

Bug: 1042208
Change-Id: I801d46c86d1ee02b69135224271f442595601a85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017349Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735297}

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_keyed_service_factory.cc

@@ -19,7 +19,7 @@ BreadcrumbManagerKeyedServiceFactory::GetInstance() {
 // static
 BreadcrumbManagerKeyedService*
 BreadcrumbManagerKeyedServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<BreadcrumbManagerKeyedService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, /*create=*/true));
 }

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_keyed_service_factory.h

@@ -7,16 +7,16 @@
 
 #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 BreadcrumbManagerKeyedService;
+class ChromeBrowserState;
 
 class BreadcrumbManagerKeyedServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static BreadcrumbManagerKeyedServiceFactory* GetInstance();
   static BreadcrumbManagerKeyedService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
  private:
   friend class base::NoDestructor<BreadcrumbManagerKeyedServiceFactory>;

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_keyed_service_unittest.mm

@@ -24,7 +24,7 @@ namespace {
 std::unique_ptr<KeyedService> BuildBreadcrumbManagerKeyedService(
     web::BrowserState* browser_state) {
   return std::make_unique<BreadcrumbManagerKeyedService>(
-      ios::ChromeBrowserState::FromBrowserState(browser_state));
+      ChromeBrowserState::FromBrowserState(browser_state));
 }
 }
 
@@ -59,7 +59,7 @@ TEST_F(BreadcrumbManagerKeyedServiceTest, EventsLabeledWithBrowserState) {
   breadcrumb_manager_service_->AddEvent("event");
   std::string event = breadcrumb_manager_service_->GetEvents(0).front();
 
-  ios::ChromeBrowserState* off_the_record_browser_state =
+  ChromeBrowserState* off_the_record_browser_state =
       chrome_browser_state_->GetOffTheRecordChromeBrowserState();
 
   BreadcrumbManagerKeyedService* otr_breadcrumb_manager_service =

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_manager_tab_helper.mm

@@ -25,8 +25,8 @@ BreadcrumbManagerTabHelper::BreadcrumbManagerTabHelper(web::WebState* web_state)
 BreadcrumbManagerTabHelper::~BreadcrumbManagerTabHelper() = default;
 
 void BreadcrumbManagerTabHelper::LogEvent(const std::string& event) {
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(web_state_->GetBrowserState());
   std::string event_log =
       base::StringPrintf("Tab%d %s", unique_id_, event.c_str());
   BreadcrumbManagerKeyedServiceFactory::GetForBrowserState(chrome_browser_state)

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_persistent_storage_keyed_service_factory.cc

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

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_persistent_storage_keyed_service_factory.h

@@ -7,16 +7,16 @@
 
 #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 BreadcrumbPersistentStorageKeyedService;
+class ChromeBrowserState;
 
 class BreadcrumbPersistentStorageKeyedServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static BreadcrumbPersistentStorageKeyedServiceFactory* GetInstance();
   static BreadcrumbPersistentStorageKeyedService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
  private:
   friend class base::NoDestructor<

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_persistent_storage_keyed_service_unittest.mm

@@ -27,7 +27,7 @@ namespace {
 std::unique_ptr<KeyedService> BuildBreadcrumbPersistentStorageKeyedService(
     web::BrowserState* browser_state) {
   return std::make_unique<BreadcrumbPersistentStorageKeyedService>(
-      ios::ChromeBrowserState::FromBrowserState(browser_state));
+      ChromeBrowserState::FromBrowserState(browser_state));
 }
 }
 

ios/chrome/browser/crash_report/breadcrumbs/breadcrumb_persistent_storage_util_unittest.mm

@@ -36,7 +36,7 @@ TEST_F(BreadcrumbPersistentStorageUtilTest, UniqueStorage) {
 TEST_F(BreadcrumbPersistentStorageUtilTest, UniqueIncognitoStorage) {
   base::FilePath path1 =
       GetBreadcrumbPersistentStorageFilePath(GetBrowserState());
-  ios::ChromeBrowserState* off_the_record_browser_state =
+  ChromeBrowserState* off_the_record_browser_state =
       chrome_browser_state_->GetOffTheRecordChromeBrowserState();
   base::FilePath path2 =
       GetBreadcrumbPersistentStorageFilePath(off_the_record_browser_state);