Refactor ScopedCommandLineSwitch

chrome/browser/extensions/permission_message_combinations_unittest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permission_message_test_util.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
+#include "extensions/common/test/scoped_command_line_switch.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 // Tests that ChromePermissionMessageProvider produces the expected messages for
 // various combinations of app/extension permissions.
 class PermissionMessageCombinationsUnittest : public testing::Test {
  public:
   PermissionMessageCombinationsUnittest()
       : message_provider_(new ChromePermissionMessageProvider()) {}
   ~PermissionMessageCombinationsUnittest() override {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
     // Force creation of ExtensionPrefs before adding extensions.
     env_.GetExtensionPrefs();
 
     // Whitelist a known extension id so we can test all permissions. This ID
     // will be used for each test app.
-    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kWhitelistedExtensionID, "ahplfneplbnjcflhdgkkjeiglkkfeelb");
+    command_line_.reset(new ScopedCommandLineSwitch(
+        switches::kWhitelistedExtensionID, "ahplfneplbnjcflhdgkkjeiglkkfeelb"));
   }
 
  protected:
   // Create and install an app or extension with the given manifest JSON string.
   // Single-quotes in the string will be replaced with double quotes.
   void CreateAndInstall(const std::string& json_manifest) {
     // Add the manifest key so that the ID will be the whitelisted ID.
     std::string json_manifest_with_key = json_manifest;
     json_manifest_with_key.replace(json_manifest.length() - 1,
        json_manifest.length(),
@@ skipping 150 matching lines @@
     expected_submessages.push_back(expected_submessages_5);
     return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
                                                    expected_messages,
                                                    expected_submessages, false);
   }
 
  private:
   extensions::TestExtensionEnvironment env_;
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
   scoped_refptr<const Extension> app_;
+  // Whitelist a known extension id so we can test all permissions. This ID
+  // will be used for each test app.
+  scoped_ptr<ScopedCommandLineSwitch> command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMessageCombinationsUnittest);
 };
 
 // Test that the USB, Bluetooth and Serial permissions do not coalesce on their
 // own, but do coalesce when more than 1 is present.
 TEST_F(PermissionMessageCombinationsUnittest, USBSerialBluetoothCoalescing) {
   // Test that the USB permission does not coalesce on its own.
   CreateAndInstall(
       "{"
@@ skipping 953 matching lines @@
 // TODO(sashab): Add a test that ensures that all permissions that can generate
 // a coalesced message can also generate a message on their own (i.e. ensure
 // that no permissions only modify other permissions).
 
 // TODO(sashab): Add a test for every permission message combination that can
 // generate a message.
 
 // TODO(aboxhall): Add tests for the automation API permission messages.
 
 }  // namespace extensions