Make callers of CommandLine use it via the base:: namespace.
Covers chrome/app* and chrome/browser/* through e.
BUG=422426
TEST=none
[email protected]
Review URL: https://codereview.chromium.org/819133004
Cr-Commit-Position: refs/heads/master@{#309476}
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 17cb2d8b..947c600 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -5601,12 +5601,12 @@
scoped_ptr<chromeos::ScopedTestUserManager> user_manager(
new chromeos::ScopedTestUserManager);
#endif
- scoped_ptr<CommandLine> command_line;
+ scoped_ptr<base::CommandLine> command_line;
base::FilePath install_dir = profile->GetPath()
.AppendASCII(extensions::kInstallDirectoryName);
// By default, we are enabled.
- command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
+ command_line.reset(new base::CommandLine(base::CommandLine::NO_PROGRAM));
ExtensionService* service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
@@ -5653,7 +5653,7 @@
recorder.set_ready(false);
profile.reset(new TestingProfile());
profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
- command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
+ command_line.reset(new base::CommandLine(base::CommandLine::NO_PROGRAM));
service = static_cast<extensions::TestExtensionSystem*>(
ExtensionSystem::Get(profile.get()))->
CreateExtensionService(
@@ -7041,7 +7041,7 @@
// permissions.
TEST_F(ExtensionServiceTest, InstallWhitelistedExtension) {
std::string test_id = "hdkklepkcpckhnpgjnmbdfhehckloojk";
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
extensions::switches::kWhitelistedExtensionID, test_id);
InitializeEmptyExtensionService();