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

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/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"
 #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 57 matching lines @@
     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(
+    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)
       *tab_state_flags |= TABSTATE_HAS_CHANGED;
     if (saved_setting != CONTENT_SETTING_ASK)
       *tab_state_flags |= TABSTATE_HAS_ANY_ICON;
   }
 }
 
 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);
 }