Migrate geolocation settings 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 b07436ee4fee1b12e24065b7545fd88a6ac0fd2d..ff35d14e7fc187e8585a8c2aeb11726c07b0f819 100644
--- a/chrome/browser/geolocation/geolocation_settings_state.cc
+++ b/chrome/browser/geolocation/geolocation_settings_state.cc
@@ -9,7 +9,6 @@
 #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"
@@ -87,8 +86,11 @@ void GeolocationSettingsState::GetDetailedInfo(
     }
 
     const ContentSetting saved_setting =
-        profile_->GetGeolocationContentSettingsMap()->GetContentSetting(
-            i->first, embedder_url_);
+       profile_->GetHostContentSettingsMap()->GetContentSetting(

[Bernhard Bauer, 2011/08/03 15:22:50]

Nit: indent one more space.

[markusheintz_, 2011/08/04 12:45:56]

Done.

+            i->first,
+            embedder_url_,
+            CONTENT_SETTINGS_TYPE_GEOLOCATION,
+            std::string());
     if (saved_setting != default_setting)
       *tab_state_flags |= TABSTATE_HAS_EXCEPTION;
     if (saved_setting != i->second)