Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/content_settings_dialog_controller.h"
 
+#include "base/auto_reset.h"
+#include "base/command_line.h"
 #import "base/scoped_nsobject.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 class ContentSettingsDialogControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
     TestingProfile* profile = browser_helper_.profile();
@@ skipping 131 matching lines @@
 TEST_F(ContentSettingsDialogControllerTest, PluginsSetting) {
   // Change setting, check dialog property.
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                          CONTENT_SETTING_ALLOW);
   EXPECT_EQ(kPluginsAllowIndex, [controller_ pluginsEnabledIndex]);
 
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                          CONTENT_SETTING_BLOCK);
   EXPECT_EQ(kPluginsBlockIndex, [controller_ pluginsEnabledIndex]);
 
-  settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                         CONTENT_SETTING_ASK);
-  EXPECT_EQ(kPluginsAskIndex, [controller_ pluginsEnabledIndex]);
+  {
+    // 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);
+
+    settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                           CONTENT_SETTING_ASK);
+    EXPECT_EQ(kPluginsAskIndex, [controller_ pluginsEnabledIndex]);
+  }
 
   // Change dialog property, check setting.
   NSInteger setting;
   [controller_ setPluginsEnabledIndex:kPluginsAllowIndex];
   setting =
       settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
 
   [controller_ setPluginsEnabledIndex:kPluginsBlockIndex];
   setting =
       settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   EXPECT_EQ(CONTENT_SETTING_BLOCK, setting);
 
-  [controller_ setPluginsEnabledIndex:kPluginsAskIndex];
-  setting =
-      settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
-  EXPECT_EQ(CONTENT_SETTING_ASK, setting);
+  {
+    CommandLine* cmd = CommandLine::ForCurrentProcess();
+    AutoReset<CommandLine> auto_reset(cmd, *cmd);
+    cmd->AppendSwitch(switches::kEnableClickToPlay);
+
+    [controller_ setPluginsEnabledIndex:kPluginsAskIndex];
+    setting =
+        settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
+    EXPECT_EQ(CONTENT_SETTING_ASK, setting);
+  }
 }
 
 TEST_F(ContentSettingsDialogControllerTest, PopupsSetting) {
   // Change setting, check dialog property.
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_POPUPS,
                                          CONTENT_SETTING_ALLOW);
   EXPECT_EQ([controller_ popupsEnabledIndex], kContentSettingsEnabledIndex);
 
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_POPUPS,
                                          CONTENT_SETTING_BLOCK);
@@ skipping 67 matching lines @@
   EXPECT_EQ(setting, CONTENT_SETTING_ASK);
 
   [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex];
   setting =
       notificationsService_->GetDefaultContentSetting();
   EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
 }
 
 }  // namespace