Introduce ScopedCommandLine

chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
+#include "base/test/command_line_test_util.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
 #include "extensions/browser/uninstall_reason.h"
@@ skipping 45 matching lines @@
   EXPECT_FALSE(activity_log->IsDatabaseEnabled());
   EXPECT_FALSE(activity_log->IsWatchdogAppActive());
 }
 
 TEST_F(ActivityLogEnabledTest, CommandLineSwitch) {
   std::unique_ptr<TestingProfile> profile1(
       static_cast<TestingProfile*>(CreateBrowserContext()));
   std::unique_ptr<TestingProfile> profile2(
       static_cast<TestingProfile*>(CreateBrowserContext()));
 
-  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
-  base::CommandLine saved_cmdline_ = *base::CommandLine::ForCurrentProcess();
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+  ActivityLog* activity_log1;
+  {
+    base::test::ScopedCommandLine scoped_command_line;
+    scoped_command_line.GetProcessCommandLine()->AppendSwitch(
       switches::kEnableExtensionActivityLogging);
-  ActivityLog* activity_log1 = ActivityLog::GetInstance(profile1.get());
-  *base::CommandLine::ForCurrentProcess() = saved_cmdline_;
+    activity_log1 = ActivityLog::GetInstance(profile1.get());
+  }
   ActivityLog* activity_log2 = ActivityLog::GetInstance(profile2.get());
 
   EXPECT_EQ(0,
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_EQ(0,
       profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
   EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
   EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
   EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
@@ skipping 134 matching lines @@
   extension_service1->DisableExtension(kExtensionID,
                                        Extension::DISABLE_USER_ACTION);
   extension_service1->DisableExtension("fpofdchlamddhnajleknffcbmnjfahpg",
                                        Extension::DISABLE_USER_ACTION);
   EXPECT_EQ(0,
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
 }
 
 TEST_F(ActivityLogEnabledTest, AppAndCommandLine) {
-  // Set the command line switch.
-  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
-  base::CommandLine saved_cmdline_ = *base::CommandLine::ForCurrentProcess();
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+  base::test::ScopedCommandLine scoped_command_line;
+  scoped_command_line.GetProcessCommandLine()->AppendSwitch(
       switches::kEnableExtensionActivityLogging);
 
   std::unique_ptr<TestingProfile> profile(
       static_cast<TestingProfile*>(CreateBrowserContext()));
   // Extension service is destroyed by the profile.
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   ExtensionService* extension_service =
     static_cast<TestExtensionSystem*>(
         ExtensionSystem::Get(profile.get()))->CreateExtensionService(
             &command_line, base::FilePath(), false);
   static_cast<TestExtensionSystem*>(
       ExtensionSystem::Get(profile.get()))->SetReady();
 
   ActivityLog* activity_log = ActivityLog::GetInstance(profile.get());
   // Allow Activity Log to install extension tracker.
   base::RunLoop().RunUntilIdle();
@@ skipping 23 matching lines @@
   extension_service->UninstallExtension(
       kExtensionID,
       extensions::UNINSTALL_REASON_FOR_TESTING,
       base::Bind(&base::DoNothing),
       NULL);
 
   EXPECT_TRUE(activity_log->IsDatabaseEnabled());
   EXPECT_EQ(0,
       profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(activity_log->IsWatchdogAppActive());
-
-  // Cleanup.
-  *base::CommandLine::ForCurrentProcess() = saved_cmdline_;
 }
 
 }  // namespace extensions