Merge 119773 - Move click-to-play out of chrome://flags.

chrome/browser/content_settings/host_content_settings_map_unittest.cc

Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index 001d21d7a9240c044af86cf6ae223f63dee3f5e2..51e923e094091c2c8035fe3b5138e3c93c305488 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -57,11 +57,6 @@ TEST_F(HostContentSettingsMapTest, DefaultValues) {
                 CONTENT_SETTINGS_TYPE_IMAGES,
                 std::string()));
   {
-    // Click-to-play needs to be enabled to set the content setting to ASK.
-    CommandLine* cmd = CommandLine::ForCurrentProcess();
-    AutoReset<CommandLine> auto_reset(cmd, *cmd);
-    cmd->AppendSwitch(switches::kEnableClickToPlay);
-
     host_content_settings_map->SetDefaultContentSetting(
         CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK);
     EXPECT_EQ(CONTENT_SETTING_ASK,