diff options
| author | avi <avi@chromium.org> | 2014-12-22 15:31:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 23:32:42 +0000 |
| commit | 556c05027f6d983007890054b6a9303a2bd4a4a2 (patch) | |
| tree | b98340940909e087f8779f6b3aefe97afda17ed2 /chrome/browser/invalidation | |
| parent | 6b8237f513dc4cd044ff117fc12ee9178b4562e8 (diff) | |
| download | chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.zip chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.tar.gz chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers chrome/browser/* from f on.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/816403003
Cr-Commit-Position: refs/heads/master@{#309485}
Diffstat (limited to 'chrome/browser/invalidation')
| -rw-r--r-- | chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/invalidation/ticl_profile_settings_provider.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc index 1745e2e..161d37c 100644 --- a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc @@ -52,7 +52,7 @@ class ProfileInvalidationProviderFactoryLoginScreenBrowserTest ProfileInvalidationProviderFactoryLoginScreenBrowserTest(); virtual ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest(); - virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; private: DISALLOW_COPY_AND_ASSIGN( @@ -68,7 +68,7 @@ ProfileInvalidationProviderFactoryLoginScreenBrowserTest:: } void ProfileInvalidationProviderFactoryLoginScreenBrowserTest::SetUpCommandLine( - CommandLine* command_line) { + base::CommandLine* command_line) { command_line->AppendSwitch(chromeos::switches::kLoginManager); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); } @@ -88,7 +88,7 @@ class ProfileInvalidationProviderFactoryGuestBrowserTest ProfileInvalidationProviderFactoryGuestBrowserTest(); virtual ~ProfileInvalidationProviderFactoryGuestBrowserTest(); - virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; private: DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryGuestBrowserTest); @@ -103,7 +103,7 @@ ProfileInvalidationProviderFactoryGuestBrowserTest:: } void ProfileInvalidationProviderFactoryGuestBrowserTest::SetUpCommandLine( - CommandLine* command_line) { + base::CommandLine* command_line) { command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(::switches::kIncognito); command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider.cc b/chrome/browser/invalidation/ticl_profile_settings_provider.cc index 978f418..b016012 100644 --- a/chrome/browser/invalidation/ticl_profile_settings_provider.cc +++ b/chrome/browser/invalidation/ticl_profile_settings_provider.cc @@ -43,7 +43,7 @@ bool TiclProfileSettingsProvider::UseGCMChannel() const { return true; } - if (CommandLine::ForCurrentProcess()->HasSwitch( + if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kInvalidationUseGCMChannel)) { // Use GCM channel if it was enabled via a command-line switch. return true; |