Replace SetContentSetting method of the content_settings::Provider interface with GetWebsiteSetting

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 9c5f41b8a7dc504dcc6d340023cc3a7d390776f0..098037e9114d1e9b6a470d4e6af11c68fc57692b 100644
--- a/chrome/browser/geolocation/geolocation_settings_state.cc
+++ b/chrome/browser/geolocation/geolocation_settings_state.cc
@@ -8,6 +8,7 @@
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -85,12 +86,16 @@ void GeolocationSettingsState::GetDetailedInfo(
       (*formatted_hosts_per_state)[i->second].insert(final_formatted_host);
     }
 
-    const ContentSetting saved_setting =
-        profile_->GetHostContentSettingsMap()->GetContentSetting(
+    scoped_ptr<base::Value> value(
+        profile_->GetHostContentSettingsMap()->GetWebsiteSetting(

[Bernhard Bauer, 2011/11/11 14:00:40]

Same here.

[markusheintz_, 2011/11/14 11:15:10]

same as other

             i->first,
             embedder_url_,
             CONTENT_SETTINGS_TYPE_GEOLOCATION,
-            std::string());
+            std::string(),
+            NULL));
+    const ContentSetting saved_setting =
+        content_settings::ValueToContentSetting(value.get());
+
     if (saved_setting != default_setting)
       *tab_state_flags |= TABSTATE_HAS_EXCEPTION;
     if (saved_setting != i->second)