Refactor ScopedCommandLineSwitch

chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc

 // Copyright (c) 2012 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/json/json_file_value_serializer.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/csp_info.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "extensions/common/switches.h"
+#include "extensions/common/test/scoped_command_line_switch.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 
 class PlatformAppsManifestTest : public ChromeManifestTest {
 };
 
 TEST_F(PlatformAppsManifestTest, PlatformApps) {
@@ skipping 36 matching lines @@
             "but this is a packaged app."),
   };
   RunTestcases(
       warning_testcases, arraysize(warning_testcases), EXPECT_TYPE_WARNING);
 }
 
 TEST_F(PlatformAppsManifestTest, PlatformAppContentSecurityPolicy) {
   // The whitelisted extension ID is cached the first time it is used, so set it
   // before running the test. This is the ID corresponding to the base 64
   // encoded key in the init_platform_app_csp.json manifest.
-  std::string test_id = "ahplfneplbnjcflhdgkkjeiglkkfeelb";
-  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kWhitelistedExtensionID, test_id);
+  ScopedCommandLineSwitch command_line(switches::kWhitelistedExtensionID,
+                                       "ahplfneplbnjcflhdgkkjeiglkkfeelb");
 
   // Normal platform apps can't specify a CSP value.
   Testcase warning_testcases[] = {
     Testcase(
         "init_platform_app_csp_warning_1.json",
         "'content_security_policy' is only allowed for extensions and legacy "
             "packaged apps, but this is a packaged app."),
     Testcase(
         "init_platform_app_csp_warning_2.json",
         "'app.content_security_policy' is not allowed for specified extension "
@@ skipping 51 matching lines @@
 
   // First try to load without any flags. This should warn for every API.
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
     LoadAndExpectWarning(
         ManifestData(manifests[i].get(), ""),
         "'experimental' requires the 'experimental-extension-apis' "
         "command line switch to be enabled.");
   }
 
   // Now try again with the experimental flag set.
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+  ScopedCommandLineSwitch command_line(
       switches::kEnableExperimentalExtensionApis);
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
     LoadAndExpectSuccess(ManifestData(manifests[i].get(), ""));
   }
 }
 
 }  // namespace extensions