Move GeolocationSettingsState to ContentSettingsUsagesState

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/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
@@ skipping 902 matching lines @@
     DomainList domain_list;
     domain_list.title = l10n_util::GetStringUTF8(title_id);
     domain_list.hosts = hosts;
     add_domain_list(domain_list);
   }
 }
 
 void ContentSettingDomainListBubbleModel::SetDomainsAndCustomLink() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  const GeolocationSettingsState& settings =
-      content_settings->geolocation_settings_state();
-  GeolocationSettingsState::FormattedHostsPerState formatted_hosts_per_state;
+  const ContentSettingsUsagesState& usages =
+      content_settings->geolocation_usages_state();
+  ContentSettingsUsagesState::FormattedHostsPerState formatted_hosts_per_state;
   unsigned int tab_state_flags = 0;
-  settings.GetDetailedInfo(&formatted_hosts_per_state, &tab_state_flags);
+  usages.GetDetailedInfo(&formatted_hosts_per_state, &tab_state_flags);
   // Divide the tab's current geolocation users into sets according to their
   // permission state.
   MaybeAddDomainList(formatted_hosts_per_state[CONTENT_SETTING_ALLOW],
                      IDS_GEOLOCATION_BUBBLE_SECTION_ALLOWED);
 
   MaybeAddDomainList(formatted_hosts_per_state[CONTENT_SETTING_BLOCK],
                      IDS_GEOLOCATION_BUBBLE_SECTION_DENIED);
 
-  if (tab_state_flags & GeolocationSettingsState::TABSTATE_HAS_EXCEPTION) {
+  if (tab_state_flags & ContentSettingsUsagesState::TABSTATE_HAS_EXCEPTION) {
     set_custom_link(l10n_util::GetStringUTF8(
         IDS_GEOLOCATION_BUBBLE_CLEAR_LINK));
     set_custom_link_enabled(true);
   } else if (tab_state_flags &
-             GeolocationSettingsState::TABSTATE_HAS_CHANGED) {
+             ContentSettingsUsagesState::TABSTATE_HAS_CHANGED) {
     set_custom_link(l10n_util::GetStringUTF8(
         IDS_GEOLOCATION_BUBBLE_REQUIRE_RELOAD_TO_CLEAR));
   }
 }
 
 void ContentSettingDomainListBubbleModel::OnCustomLinkClicked() {
   if (!web_contents())
     return;
   // Reset this embedder's entry to default for each of the requesting
   // origins currently on the page.
   const GURL& embedder_url = web_contents()->GetURL();
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  const GeolocationSettingsState::StateMap& state_map =
-      content_settings->geolocation_settings_state().state_map();
+  const ContentSettingsUsagesState::StateMap& state_map =
+      content_settings->geolocation_usages_state().state_map();
   HostContentSettingsMap* settings_map =
       profile()->GetHostContentSettingsMap();
 
-  for (GeolocationSettingsState::StateMap::const_iterator it =
+  for (ContentSettingsUsagesState::StateMap::const_iterator it =
        state_map.begin(); it != state_map.end(); ++it) {
     settings_map->SetContentSetting(
         ContentSettingsPattern::FromURLNoWildcard(it->first),
         ContentSettingsPattern::FromURLNoWildcard(embedder_url),
         CONTENT_SETTINGS_TYPE_GEOLOCATION,
         std::string(),
         CONTENT_SETTING_DEFAULT);
   }
 }
 
@@ skipping 246 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;
   }
 }