Index: chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc |
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc |
index 56115aa87ad41d296e9ba235bb5628974e44fa0c..dae2af6085556d0d5a52bf89d82d9e747315af6f 100644 |
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc |
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc |
@@ -37,16 +37,16 @@ class FullStreamUIPolicyTest : public testing::Test { |
public: |
FullStreamUIPolicyTest() |
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
- saved_cmdline_(CommandLine::NO_PROGRAM) { |
+ saved_cmdline_(base::CommandLine::NO_PROGRAM) { |
#if defined OS_CHROMEOS |
test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
#endif |
- CommandLine command_line(CommandLine::NO_PROGRAM); |
- saved_cmdline_ = *CommandLine::ForCurrentProcess(); |
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM); |
+ saved_cmdline_ = *base::CommandLine::ForCurrentProcess(); |
profile_.reset(new TestingProfile()); |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kEnableExtensionActivityLogging); |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kEnableExtensionActivityLogTesting); |
extension_service_ = static_cast<TestExtensionSystem*>( |
ExtensionSystem::Get(profile_.get()))->CreateExtensionService |
@@ -61,7 +61,7 @@ class FullStreamUIPolicyTest : public testing::Test { |
profile_.reset(NULL); |
base::RunLoop().RunUntilIdle(); |
// Restore the original command line and undo the affects of SetUp(). |
- *CommandLine::ForCurrentProcess() = saved_cmdline_; |
+ *base::CommandLine::ForCurrentProcess() = saved_cmdline_; |
} |
// A wrapper function for CheckReadFilteredData, so that we don't need to |
@@ -443,7 +443,7 @@ class FullStreamUIPolicyTest : public testing::Test { |
// The test framework will do this itself as well. However, by then, |
// it is too late to call ActivityLog::RecomputeLoggingIsEnabled() in |
// TearDown(). |
- CommandLine saved_cmdline_; |
+ base::CommandLine saved_cmdline_; |
#if defined OS_CHROMEOS |
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |