Migrate default geolocation content setting to host content settings map.

chrome/browser/geolocation/geolocation_settings_state.cc

 // Copyright (c) 2011 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 <string>
+
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "net/base/net_util.h"
 
 GeolocationSettingsState::GeolocationSettingsState(Profile* profile)
   : profile_(profile) {
@@ skipping 28 matching lines @@
 
 void GeolocationSettingsState::ClearStateMap() {
   state_map_.clear();
 }
 
 void GeolocationSettingsState::GetDetailedInfo(
     FormattedHostsPerState* formatted_hosts_per_state,
     unsigned int* tab_state_flags) const {
   DCHECK(tab_state_flags);
   DCHECK(embedder_url_.is_valid());
-  const ContentSetting default_setting =
-      profile_->GetGeolocationContentSettingsMap()->GetDefaultContentSetting();
+  ContentSetting default_setting =
+      profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
+          CONTENT_SETTINGS_TYPE_GEOLOCATION);
   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);
     }
@@ skipping 25 matching lines @@
   }
 }
 
 std::string GeolocationSettingsState::GURLToFormattedHost(
     const GURL& url) const {
   string16 display_host;
   net::AppendFormattedHost(url,
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), &display_host);
   return UTF16ToUTF8(display_host);
 }