Commit 17001c8a authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/webui/gcm

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

Bug: 1042208
Change-Id: I0c199de9196dd99bafd78ff8ddb0e68c9d43d8c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017366
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736297}
parent 75f2a146
......@@ -89,8 +89,8 @@ void GcmInternalsUIMessageHandler::RequestAllInfo(const base::ListValue* args) {
gcm::GCMDriver::ClearActivityLogs clear_activity_logs =
clear_logs ? gcm::GCMDriver::CLEAR_LOGS : gcm::GCMDriver::KEEP_LOGS;
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromWebUIIOS(web_ui());
ChromeBrowserState* browser_state =
ChromeBrowserState::FromWebUIIOS(web_ui());
gcm::GCMProfileService* profile_service =
IOSChromeGCMProfileServiceFactory::GetForBrowserState(browser_state);
......@@ -115,8 +115,8 @@ void GcmInternalsUIMessageHandler::SetRecording(const base::ListValue* args) {
return;
}
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromWebUIIOS(web_ui());
ChromeBrowserState* browser_state =
ChromeBrowserState::FromWebUIIOS(web_ui());
gcm::GCMProfileService* profile_service =
IOSChromeGCMProfileServiceFactory::GetForBrowserState(browser_state);
......@@ -133,8 +133,8 @@ void GcmInternalsUIMessageHandler::SetRecording(const base::ListValue* args) {
void GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished(
const gcm::GCMClient::GCMStatistics& stats) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromWebUIIOS(web_ui());
ChromeBrowserState* browser_state =
ChromeBrowserState::FromWebUIIOS(web_ui());
DCHECK(browser_state);
gcm::GCMProfileService* profile_service =
IOSChromeGCMProfileServiceFactory::GetForBrowserState(browser_state);
......@@ -171,7 +171,7 @@ GCMInternalsUI::GCMInternalsUI(web::WebUIIOS* web_ui)
IDR_GCM_DRIVER_GCM_INTERNALS_JS);
html_source->SetDefaultResource(IDR_GCM_DRIVER_GCM_INTERNALS_HTML);
web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
html_source);
web_ui->AddMessageHandler(std::make_unique<GcmInternalsUIMessageHandler>());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment