Reintegrate 552 r66225-r66645....

chrome/browser/content_setting_bubble_model.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 "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/blocked_content_container.h"
@@ skipping 279 matching lines @@
  public:
   ContentSettingPluginBubbleModel(TabContents* tab_contents, Profile* profile,
                                   ContentSettingsType content_type)
       : ContentSettingSingleRadioGroup(tab_contents, profile, content_type) {
     DCHECK_EQ(content_type, CONTENT_SETTINGS_TYPE_PLUGINS);
     SetLoadPluginsLinkTitle();
   }
 
  private:
   void SetLoadPluginsLinkTitle() {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableClickToPlay)) {
-      set_load_plugins_link_title(
-          l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));
-     }
+    set_load_plugins_link_title(
+        l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));
    }
 
   virtual void OnLoadPluginsLinkClicked() {
-    DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kDisableClickToPlay));
     UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble"));
     if (tab_contents()) {
       tab_contents()->render_view_host()->LoadBlockedPlugins();
     }
     set_load_plugins_link_enabled(false);
     TabSpecificContentSettings* settings =
         tab_contents()->GetTabSpecificContentSettings();
     settings->set_load_plugins_link_enabled(false);
   }
 };
@@ skipping 159 matching lines @@
   bubble_content_.resource_identifiers.insert(resource_identifier);
 }
 
 void ContentSettingBubbleModel::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   DCHECK(source == Source<TabContents>(tab_contents_));
   tab_contents_ = NULL;
 }