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

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

Bug: 1042208
Change-Id: I9953fbcbd08b61ac98b77be0d838649534a671a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014917
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734544}

ios/chrome/browser/metrics/incognito_web_state_observer.h

@@ -26,10 +26,10 @@ class IncognitoWebStateObserver : public TabModelListObserver,
   // TabModelListObserver:
   void TabModelRegisteredWithBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
   void TabModelUnregisteredFromBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
 
   // WebStateListObserver:
   void WebStateInsertedAt(WebStateList* web_state_list,

ios/chrome/browser/metrics/incognito_web_state_observer.mm

@@ -20,17 +20,17 @@ IncognitoWebStateObserver::IncognitoWebStateObserver() {
   TabModelList::AddObserver(this);
 
   // Observe all existing off-the-record TabModels' WebStateLists.
-  std::vector<ios::ChromeBrowserState*> browser_states =
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
 
-  for (ios::ChromeBrowserState* browser_state : browser_states) {
+  for (ChromeBrowserState* browser_state : browser_states) {
     DCHECK(!browser_state->IsOffTheRecord());
 
     if (!browser_state->HasOffTheRecordChromeBrowserState())
       continue;
-    ios::ChromeBrowserState* otr_browser_state =
+    ChromeBrowserState* otr_browser_state =
         browser_state->GetOffTheRecordChromeBrowserState();
 
     NSArray<TabModel*>* tab_models =
@@ -46,7 +46,7 @@ IncognitoWebStateObserver::~IncognitoWebStateObserver() {
 
 void IncognitoWebStateObserver::TabModelRegisteredWithBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   if (browser_state->IsOffTheRecord() &&
       !scoped_observer_.IsObserving([tab_model webStateList])) {
     scoped_observer_.Add([tab_model webStateList]);
@@ -55,7 +55,7 @@ void IncognitoWebStateObserver::TabModelRegisteredWithBrowserState(
 
 void IncognitoWebStateObserver::TabModelUnregisteredFromBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   if (browser_state->IsOffTheRecord()) {
     DCHECK(scoped_observer_.IsObserving([tab_model webStateList]));
     scoped_observer_.Remove([tab_model webStateList]);

ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h

@@ -21,10 +21,10 @@
 #include "components/omnibox/browser/omnibox_event_global_tracker.h"
 #include "components/ukm/observers/history_delete_observer.h"
 #include "components/ukm/observers/ukm_consent_state_observer.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/metrics/incognito_web_state_observer.h"
 #include "ios/web/public/deprecated/global_web_state_observer.h"
 
+class ChromeBrowserState;
 class IOSChromeStabilityMetricsProvider;
 class PrefRegistrySimple;
 
@@ -117,7 +117,7 @@ class IOSChromeMetricsServiceClient : public IncognitoWebStateObserver,
 
   // Register to observe events on a browser state's services.
   // Returns true if registration was successful.
-  bool RegisterForBrowserStateEvents(ios::ChromeBrowserState* browser_state);
+  bool RegisterForBrowserStateEvents(ChromeBrowserState* browser_state);
 
   // Called when a tab is parented.
   void OnTabParented(web::WebState* web_state);

ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm

@@ -335,12 +335,12 @@ bool IOSChromeMetricsServiceClient::RegisterForNotifications() {
           base::Bind(&IOSChromeMetricsServiceClient::OnURLOpenedFromOmnibox,
                      base::Unretained(this)));
 
-  std::vector<ios::ChromeBrowserState*> loaded_browser_states =
+  std::vector<ChromeBrowserState*> loaded_browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
   bool all_profiles_succeeded = true;
-  for (ios::ChromeBrowserState* browser_state : loaded_browser_states) {
+  for (ChromeBrowserState* browser_state : loaded_browser_states) {
     if (!RegisterForBrowserStateEvents(browser_state)) {
       all_profiles_succeeded = false;
     }
@@ -349,7 +349,7 @@ bool IOSChromeMetricsServiceClient::RegisterForNotifications() {
 }
 
 bool IOSChromeMetricsServiceClient::RegisterForBrowserStateEvents(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   history::HistoryService* history_service =
       ios::HistoryServiceFactory::GetForBrowserState(
           browser_state, ServiceAccessType::IMPLICIT_ACCESS);

ios/chrome/browser/metrics/ios_chrome_metrics_service_client_unittest.mm

@@ -57,7 +57,7 @@ class IOSChromeMetricsServiceClientTest : public PlatformTest {
 
   web::WebTaskEnvironment task_environment_;
   IOSChromeScopedTestingChromeBrowserStateManager scoped_browser_state_manager_;
-  std::unique_ptr<ios::ChromeBrowserState> browser_state_;
+  std::unique_ptr<ChromeBrowserState> browser_state_;
   metrics::TestEnabledStateProvider enabled_state_provider_;
   TestingPrefServiceSimple prefs_;
   std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_;

ios/chrome/browser/metrics/ios_profile_session_durations_service_factory.h

@@ -8,8 +8,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;
 class IOSProfileSessionDurationsService;
 
 class IOSProfileSessionDurationsServiceFactory
@@ -17,7 +17,7 @@ class IOSProfileSessionDurationsServiceFactory
  public:
   // Creates the service if it doesn't exist already for |browser_state|.
   static IOSProfileSessionDurationsService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static IOSProfileSessionDurationsServiceFactory* GetInstance();
 

ios/chrome/browser/metrics/ios_profile_session_durations_service_factory.mm

@@ -21,7 +21,7 @@
 // static
 IOSProfileSessionDurationsService*
 IOSProfileSessionDurationsServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<IOSProfileSessionDurationsService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -48,8 +48,8 @@ IOSProfileSessionDurationsServiceFactory::
 std::unique_ptr<KeyedService>
 IOSProfileSessionDurationsServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   syncer::SyncService* sync_service =
       ProfileSyncServiceFactory::GetForBrowserState(browser_state);
   signin::IdentityManager* identity_manager =

ios/chrome/browser/metrics/new_tab_page_uma.h

@@ -5,9 +5,9 @@
 #ifndef IOS_CHROME_BROWSER_METRICS_NEW_TAB_PAGE_UMA_H_
 #define IOS_CHROME_BROWSER_METRICS_NEW_TAB_PAGE_UMA_H_
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #include "ui/base/page_transition_types.h"
 
+class ChromeBrowserState;
 class GURL;
 namespace web {
 class WebState;
@@ -34,15 +34,15 @@ enum ActionType {
   NUM_ACTION_TYPES,
 };
 
-void RecordAction(ios::ChromeBrowserState* browser_state,
+void RecordAction(ChromeBrowserState* browser_state,
                   web::WebState* web_state,
                   ActionType action);
 
 // DEPRECATED -- use the version above which passes web_state instead.
 // TODO(crbug.com/1032550) : Remove this function.
-void RecordAction(ios::ChromeBrowserState* browser_state, ActionType action);
+void RecordAction(ChromeBrowserState* browser_state, ActionType action);
 
-void RecordActionFromOmnibox(ios::ChromeBrowserState* browser_state,
+void RecordActionFromOmnibox(ChromeBrowserState* browser_state,
                              web::WebState* web_state,
                              const GURL& url,
                              ui::PageTransition transition,

ios/chrome/browser/metrics/new_tab_page_uma.mm

@@ -20,7 +20,7 @@
 
 namespace new_tab_page_uma {
 
-void RecordAction(ios::ChromeBrowserState* browser_state,
+void RecordAction(ChromeBrowserState* browser_state,
                   web::WebState* web_state,
                   ActionType action) {
   DCHECK(browser_state);
@@ -34,7 +34,7 @@ void RecordAction(ios::ChromeBrowserState* browser_state,
   counter->Add(action);
 }
 
-void RecordAction(ios::ChromeBrowserState* browser_state, ActionType action) {
+void RecordAction(ChromeBrowserState* browser_state, ActionType action) {
   DCHECK(browser_state);
   WebStateList* web_state_list =
       TabModelList::GetLastActiveTabModelForChromeBrowserState(browser_state)
@@ -43,7 +43,7 @@ void RecordAction(ios::ChromeBrowserState* browser_state, ActionType action) {
                       action);
 }
 
-void RecordActionFromOmnibox(ios::ChromeBrowserState* browser_state,
+void RecordActionFromOmnibox(ChromeBrowserState* browser_state,
                              web::WebState* web_state,
                              const GURL& url,
                              ui::PageTransition transition,