Move GeolocationSettingsState to ContentSettingsUsagesState

chrome/browser/content_settings/content_settings_usages_state.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/geolocation/geolocation_settings_state.h"
+#include "chrome/browser/content_settings/content_settings_usages_state.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "net/base/net_util.h"
 
-GeolocationSettingsState::GeolocationSettingsState(Profile* profile)
-  : profile_(profile) {
+ContentSettingsUsagesState::ContentSettingsUsagesState(Profile* profile,
+                                                       ContentSettingsType type)
+    : profile_(profile),
+      type_(type) {
 }
 
-GeolocationSettingsState::~GeolocationSettingsState() {
+ContentSettingsUsagesState::~ContentSettingsUsagesState() {
 }
 
-void GeolocationSettingsState::OnGeolocationPermissionSet(
+void ContentSettingsUsagesState::OnPermissionSet(
     const GURL& requesting_origin, bool allowed) {
   state_map_[requesting_origin] =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 }
 
-void GeolocationSettingsState::DidNavigate(
+void ContentSettingsUsagesState::DidNavigate(
     const content::LoadCommittedDetails& details) {
   if (details.entry)
     embedder_url_ = details.entry->GetURL();
   if (state_map_.empty())
     return;
   if (!details.entry ||
       details.previous_url.GetOrigin() != details.entry->GetURL().GetOrigin()) {
     state_map_.clear();
     return;
   }
   // We're in the same origin, check if there's any icon to be displayed.
   unsigned int tab_state_flags = 0;
   GetDetailedInfo(NULL, &tab_state_flags);
   if (!(tab_state_flags & TABSTATE_HAS_ANY_ICON))
     state_map_.clear();
 }
 
-void GeolocationSettingsState::ClearStateMap() {
+void ContentSettingsUsagesState::ClearStateMap() {
   state_map_.clear();
 }
 
-void GeolocationSettingsState::GetDetailedInfo(
+void ContentSettingsUsagesState::GetDetailedInfo(
     FormattedHostsPerState* formatted_hosts_per_state,
     unsigned int* tab_state_flags) const {
   DCHECK(tab_state_flags);
   DCHECK(embedder_url_.is_valid());
   ContentSetting default_setting =
       profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
-          CONTENT_SETTINGS_TYPE_GEOLOCATION, NULL);
+          type_, NULL);
   std::set<std::string> formatted_hosts;
   std::set<std::string> repeated_formatted_hosts;
 
   // Build a set of repeated formatted hosts
   for (StateMap::const_iterator i(state_map_.begin());
        i != state_map_.end(); ++i) {
     std::string formatted_host = GURLToFormattedHost(i->first);
     if (!formatted_hosts.insert(formatted_host).second) {
       repeated_formatted_hosts.insert(formatted_host);
     }
   }
 
   for (StateMap::const_iterator i(state_map_.begin());
        i != state_map_.end(); ++i) {
     if (i->second == CONTENT_SETTING_ALLOW)
       *tab_state_flags |= TABSTATE_HAS_ANY_ALLOWED;
     if (formatted_hosts_per_state) {
       std::string formatted_host = GURLToFormattedHost(i->first);
       std::string final_formatted_host =
           repeated_formatted_hosts.find(formatted_host) ==
           repeated_formatted_hosts.end() ?
           formatted_host :
           i->first.spec();
       (*formatted_hosts_per_state)[i->second].insert(final_formatted_host);
     }
 
     const ContentSetting saved_setting =
         profile_->GetHostContentSettingsMap()->GetContentSetting(
-            i->first,
-            embedder_url_,
-            CONTENT_SETTINGS_TYPE_GEOLOCATION,
-            std::string());
+            i->first, embedder_url_, type_, std::string());
     if (saved_setting != default_setting)
       *tab_state_flags |= TABSTATE_HAS_EXCEPTION;
     if (saved_setting != i->second)
       *tab_state_flags |= TABSTATE_HAS_CHANGED;
     if (saved_setting != CONTENT_SETTING_ASK)
       *tab_state_flags |= TABSTATE_HAS_ANY_ICON;
   }
 }
 
-std::string GeolocationSettingsState::GURLToFormattedHost(
+std::string ContentSettingsUsagesState::GURLToFormattedHost(
     const GURL& url) const {
   string16 display_host;
   net::AppendFormattedHost(url,
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), &display_host);
   return UTF16ToUTF8(display_host);
 }