Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3811)

Unified Diff: chrome/browser/extensions/activity_log/counting_policy_unittest.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/activity_log/counting_policy_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index 847260c08c7fab1067d6c5a663e79dfed483054f..e52a03c3c0e0bacfc0c49f8d1201734c1664031d 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -38,14 +38,14 @@ class CountingPolicyTest : public testing::Test {
public:
CountingPolicyTest()
: 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);
extension_service_ = static_cast<TestExtensionSystem*>(
ExtensionSystem::Get(profile_.get()))->CreateExtensionService
@@ -60,7 +60,7 @@ class CountingPolicyTest : 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_;
}
// Wait for the task queue for the specified thread to empty.
@@ -526,7 +526,7 @@ class CountingPolicyTest : 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_;

Powered by Google App Engine
This is Rietveld 408576698