Reintegrate 552 r66225-r66645....

chrome/browser/content_setting_bubble_model_unittest.cc

 // 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.
 
 #include "chrome/browser/content_setting_bubble_model.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/host_content_settings_map.h"
@@ skipping 91 matching lines @@
   EXPECT_NE(std::string(), bubble_content.manage_link);
   EXPECT_EQ(std::string(), bubble_content.info_link);
   EXPECT_NE(std::string(), bubble_content.title);
   EXPECT_NE(std::string(), bubble_content.load_plugins_link_title);
 }
 
 TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
+  cmd->AppendSwitch(switches::kEnableClickToPlay);
 
   HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
   std::string fooPlugin = "foo";
   std::string barPlugin = "bar";
   GURL url = contents()->GetURL();
   map->AddExceptionForURL(url,
                           CONTENT_SETTINGS_TYPE_PLUGINS,
                           fooPlugin,
                           CONTENT_SETTING_ALLOW);
   map->AddExceptionForURL(url,
@@ skipping 63 matching lines @@
   CheckGeolocationBubble(1, false, false);
 
   // Second frame denied, but not stored in the content map: requires reload.
   content_settings->OnGeolocationPermissionSet(frame2_url, false);
   CheckGeolocationBubble(2, false, true);
 
   // Change the default to block: offer a clear link for the persisted frame 1.
   setting_map->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
   CheckGeolocationBubble(2, true, false);
 }