Revert 42665 - broke build as I missed a unit test when building locally....

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 "chrome/browser/blocked_popup_container.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 
 class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel {
  public:
    ContentSettingTitleAndLinkModel(TabContents* tab_contents, Profile* profile,
       ContentSettingsType content_type)
       : ContentSettingBubbleModel(tab_contents, profile, content_type) {
      SetTitle();
      SetManageLink();
   }
 
  private:
   void SetTitle() {
     static const int kTitleIDs[CONTENT_SETTINGS_NUM_TYPES] = {
       IDS_BLOCKED_COOKIES_TITLE,
       IDS_BLOCKED_IMAGES_TITLE,
       IDS_BLOCKED_JAVASCRIPT_TITLE,
       IDS_BLOCKED_PLUGINS_TITLE,
       IDS_BLOCKED_POPUPS_TITLE,
-      0,  // Geolocation does not have an overall title.
     };
-    if (kTitleIDs[content_type()])
-      set_title(l10n_util::GetStringUTF8(kTitleIDs[content_type()]));
+    set_title(l10n_util::GetStringUTF8(kTitleIDs[content_type()]));
   }
 
   void SetManageLink() {
     static const int kLinkIDs[CONTENT_SETTINGS_NUM_TYPES] = {
       IDS_BLOCKED_COOKIES_LINK,
       IDS_BLOCKED_IMAGES_LINK,
       IDS_BLOCKED_JAVASCRIPT_LINK,
       IDS_BLOCKED_PLUGINS_LINK,
       IDS_BLOCKED_POPUPS_LINK,
-      IDS_GEOLOCATION_BUBBLE_MANAGE_LINK,
     };
     set_manage_link(l10n_util::GetStringUTF8(kLinkIDs[content_type()]));
   }
 
   virtual void OnManageLinkClicked() {
     if (tab_contents())
       tab_contents()->delegate()->ShowContentSettingsWindow(content_type());
   }
 };
 
@@ skipping 16 matching lines @@
 
     RadioGroup radio_group;
     radio_group.host = url.host();
 
     static const int kAllowIDs[CONTENT_SETTINGS_NUM_TYPES] = {
       0,  // We don't manage cookies here.
       IDS_BLOCKED_IMAGES_UNBLOCK,
       IDS_BLOCKED_JAVASCRIPT_UNBLOCK,
       IDS_BLOCKED_PLUGINS_UNBLOCK,
       IDS_BLOCKED_POPUPS_UNBLOCK,
-      0,  // We don't manage geolocation here.
     };
     std::string radio_allow_label;
     radio_allow_label = l10n_util::GetStringFUTF8(
         kAllowIDs[content_type()], UTF8ToUTF16(display_host));
 
     static const int kBlockIDs[CONTENT_SETTINGS_NUM_TYPES] = {
       0,  // We don't manage cookies here.
       IDS_BLOCKED_IMAGES_NO_ACTION,
       IDS_BLOCKED_JAVASCRIPT_NO_ACTION,
       IDS_BLOCKED_PLUGINS_NO_ACTION,
       IDS_BLOCKED_POPUPS_NO_ACTION,
-      0,  // We don't manage geolocation here.
     };
     std::string radio_block_label;
     radio_block_label = l10n_util::GetStringFUTF8(
         kBlockIDs[content_type()], UTF8ToUTF16(display_host));
 
     radio_group.radio_items.push_back(radio_allow_label);
     radio_group.radio_items.push_back(radio_block_label);
     radio_group.default_item =
         profile()->GetHostContentSettingsMap()->GetContentSetting(url,
             content_type()) == CONTENT_SETTING_ALLOW ? 0 : 1;
@@ skipping 38 matching lines @@
   }
 
   virtual void OnPopupClicked(int index) {
     if (tab_contents() && tab_contents()->blocked_popup_container()) {
       tab_contents()->blocked_popup_container()->LaunchPopupForContents(
           bubble_content().popup_items[index].tab_contents);
     }
   }
 };
 
-class ContentSettingDomainListBubbleModel
-    : public ContentSettingTitleAndLinkModel {
- public:
-  ContentSettingDomainListBubbleModel(TabContents* tab_contents,
-                                      Profile* profile,
-                                      ContentSettingsType content_type)
-      : ContentSettingTitleAndLinkModel(tab_contents, profile, content_type) {
-    DCHECK_EQ(CONTENT_SETTINGS_TYPE_GEOLOCATION, content_type) <<
-        "SetDomains currently only supports geolocation content type";
-    SetDomains();
-    SetClearLink();
-  }
-
- private:
-  void MaybeAddDomainList(DomainList* domain_list, int title_id) {
-    if (!domain_list->hosts.empty()) {
-      domain_list->title = l10n_util::GetStringUTF8(title_id);
-      add_domain_list(*domain_list);
-    }
-  }
-  void SetDomains() {
-    const TabContents::GeolocationContentSettings& settings =
-        tab_contents()->geolocation_content_settings();
-
-    // Divide the tab's current geolocation users into sets according to their
-    // permission state.
-    DomainList domain_lists[CONTENT_SETTING_NUM_SETTINGS];
-    for (TabContents::GeolocationContentSettings::const_iterator it =
-        settings.begin(); it != settings.end(); ++it) {
-      domain_lists[it->second].hosts.push_back(it->first);
-    }
-    MaybeAddDomainList(&domain_lists[CONTENT_SETTING_ALLOW],
-                       IDS_GEOLOCATION_BUBBLE_SECTION_ALLOWED);
-    MaybeAddDomainList(&domain_lists[CONTENT_SETTING_BLOCK],
-                       IDS_GEOLOCATION_BUBBLE_SECTION_DENIED);
-  }
-  void SetClearLink() {
-    set_clear_link(l10n_util::GetStringUTF8(IDS_GEOLOCATION_BUBBLE_CLEAR_LINK));
-  }
-  virtual void OnClearLinkClicked() {
-    if (!tab_contents())
-      return;
-    // Reset this embedder's entry to default for each of the requesting
-    // origins currently on the page.
-    const GURL& embedder_url = tab_contents()->GetURL();
-    const TabContents::GeolocationContentSettings& settings =
-        tab_contents()->geolocation_content_settings();
-    GeolocationContentSettingsMap* settings_map =
-        profile()->GetGeolocationContentSettingsMap();
-    for (TabContents::GeolocationContentSettings::const_iterator it =
-        settings.begin(); it != settings.end(); ++it) {
-      settings_map->SetContentSetting(it->first, embedder_url,
-                                      CONTENT_SETTING_DEFAULT);
-    }
-  }
-};
-
 // static
 ContentSettingBubbleModel*
     ContentSettingBubbleModel::CreateContentSettingBubbleModel(
         TabContents* tab_contents,
         Profile* profile,
         ContentSettingsType content_type) {
   if (content_type == CONTENT_SETTINGS_TYPE_COOKIES) {
     return new ContentSettingTitleAndLinkModel(tab_contents, profile,
                                                content_type);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_POPUPS) {
     return new ContentSettingPopupBubbleModel(tab_contents, profile,
                                               content_type);
   }
-  if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-    return new ContentSettingDomainListBubbleModel(tab_contents, profile,
-                                                   content_type);
-  }
   return new ContentSettingSingleRadioGroup(tab_contents, profile,
                                             content_type);
 }
 
 ContentSettingBubbleModel::ContentSettingBubbleModel(
     TabContents* tab_contents, Profile* profile,
     ContentSettingsType content_type)
     : tab_contents_(tab_contents), profile_(profile),
       content_type_(content_type) {
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                  Source<TabContents>(tab_contents));
 }
 
 ContentSettingBubbleModel::~ContentSettingBubbleModel() {
 }
 
 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;
 }