Revert 188727 "Merge 188160" due to compilation error in the unittest.

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
@@ skipping 259 matching lines @@
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_UNBLOCK},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK_ALL},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_UNBLOCK},
     {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_UNBLOCK},
   };
   // Fields as for kBlockedAllowIDs, above.
   static const ContentSettingsTypeIdEntry kResourceSpecificBlockedAllowIDs[] = {
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK},
   };
   static const ContentSettingsTypeIdEntry kAllowedAllowIDs[] = {
-    // TODO(bauerb): The string shouldn't be "unblock" (they weren't blocked).
-    {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK},
     {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_NO_ACTION},
   };
 
   std::string radio_allow_label;
   if (allowed) {
-    int resource_id = GetIdForContentType(kAllowedAllowIDs,
-                                          arraysize(kAllowedAllowIDs),
-                                          content_type());
-    radio_allow_label = (content_type() == CONTENT_SETTINGS_TYPE_COOKIES) ?
-        l10n_util::GetStringFUTF8(resource_id, display_host) :
-        l10n_util::GetStringUTF8(resource_id);
+    radio_allow_label = l10n_util::GetStringUTF8(
+        GetIdForContentType(kAllowedAllowIDs, arraysize(kAllowedAllowIDs),
+                            content_type()));
   } else if (resources.empty()) {
     radio_allow_label = l10n_util::GetStringFUTF8(
         GetIdForContentType(kBlockedAllowIDs, arraysize(kBlockedAllowIDs),
                             content_type()),
         display_host);
   } else {
     radio_allow_label = l10n_util::GetStringFUTF8(
         GetIdForContentType(kResourceSpecificBlockedAllowIDs,
                             arraysize(kResourceSpecificBlockedAllowIDs),
                             content_type()),
         display_host);
   }
 
   static const ContentSettingsTypeIdEntry kBlockedBlockIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_NO_ACTION},
   };
   static const ContentSettingsTypeIdEntry kAllowedBlockIDs[] = {
-    // TODO(bauerb): The string should say "block".
-    {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION},
     {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_BLOCK},
   };
 
   std::string radio_block_label;
   if (allowed) {
-    int resource_id = GetIdForContentType(kAllowedBlockIDs,
-                                          arraysize(kAllowedBlockIDs),
-                                          content_type());
-    radio_block_label = (content_type() == CONTENT_SETTINGS_TYPE_COOKIES) ?
-        l10n_util::GetStringUTF8(resource_id) :
-        l10n_util::GetStringFUTF8(resource_id, display_host);
+    radio_block_label = l10n_util::GetStringFUTF8(
+        GetIdForContentType(kAllowedBlockIDs, arraysize(kAllowedBlockIDs),
+                            content_type()),
+        display_host);
   } else {
     radio_block_label = l10n_util::GetStringUTF8(
         GetIdForContentType(kBlockedBlockIDs, arraysize(kBlockedBlockIDs),
                             content_type()));
   }
 
   radio_group.radio_items.push_back(radio_allow_label);
   radio_group.radio_items.push_back(radio_block_label);
   HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
   CookieSettings* cookie_settings =
@@ skipping 673 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }