[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/ntp
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=justincohen@chromium.org
Bug: 1042208
Change-Id: I0ef69eaf7d6bbd882e4cab49441f092e6fb2fa68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017524
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735280}
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.h b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.h
index b784160..2aee607 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.h
@@ -25,13 +25,12 @@
: ChromeCoordinator <LogoAnimationControllerOwnerOwner>
// Initializes this Coordinator with its |browserState|.
-- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
+- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
NS_UNAVAILABLE;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
- browserState:
- (ios::ChromeBrowserState*)browserState
+ browserState:(ChromeBrowserState*)browserState
NS_UNAVAILABLE;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
browser:(Browser*)browser NS_UNAVAILABLE;
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
index dff6bb71..7fc785e 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -35,7 +35,7 @@
#pragma mark - ChromeCoordinator
-- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState {
+- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState {
return [super initWithBaseViewController:nil browserState:browserState];
}
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
index acc9586..2d4431e 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
@@ -57,7 +57,7 @@
void CreateCoordinator(bool off_the_record) {
if (off_the_record) {
- ios::ChromeBrowserState* otr_state =
+ ChromeBrowserState* otr_state =
browser_state_->GetOffTheRecordChromeBrowserState();
coordinator_ =
[[NewTabPageCoordinator alloc] initWithBrowserState:otr_state];
