Migrate default geolocation content setting to host content settings map.

chrome/browser/geolocation/geolocation_settings_state.cc

Index: chrome/browser/geolocation/geolocation_settings_state.cc
diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc
index 751904e0443ad90e189fd9c5bbd74baff41acfab..82e28e7e1b05d7937882320ec6b4840e8d932edf 100644
--- a/chrome/browser/geolocation/geolocation_settings_state.cc
+++ b/chrome/browser/geolocation/geolocation_settings_state.cc
@@ -4,8 +4,11 @@
 
 #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"
@@ -55,7 +58,8 @@ void GeolocationSettingsState::GetDetailedInfo(
   DCHECK(tab_state_flags);
   DCHECK(embedder_url_.is_valid());
   const ContentSetting default_setting =

[Bernhard Bauer, 2011/07/15 13:31:44]

Nit: the |const| before |ContentSetting| isn't really necessary.

[markusheintz_, 2011/07/15 16:21:50]

Done.

-      profile_->GetGeolocationContentSettingsMap()->GetDefaultContentSetting();
+      profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
+          CONTENT_SETTINGS_TYPE_GEOLOCATION);
   std::set<std::string> formatted_hosts;
   std::set<std::string> repeated_formatted_hosts;