Migrate geolocation settings to host content settings map.

chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/favicon/favicon_tab_helper.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/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ skipping 16 matching lines @@
 int GetIdForContentType(const ContentSettingsTypeIdEntry* entries,
                         size_t num_entries,
                         ContentSettingsType type) {
   for (size_t i = 0; i < num_entries; ++i) {
     if (entries[i].type == type)
       return entries[i].id;
   }
   return 0;
 }
 
-}
+}  // namespace
 
 class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel {
  public:
   ContentSettingTitleAndLinkModel(Browser* browser,
                                   TabContentsWrapper* tab_contents,
                                   Profile* profile,
                                   ContentSettingsType content_type)
       : ContentSettingBubbleModel(tab_contents, profile, content_type),
         browser_(browser) {
      // Notifications do not have a bubble.
@@ skipping 396 matching lines @@
   virtual void OnCustomLinkClicked() OVERRIDE {
     if (!tab_contents())
       return;
     // Reset this embedder's entry to default for each of the requesting
     // origins currently on the page.
     const GURL& embedder_url = tab_contents()->tab_contents()->GetURL();
     TabSpecificContentSettings* content_settings =
         tab_contents()->content_settings();
     const GeolocationSettingsState::StateMap& state_map =
         content_settings->geolocation_settings_state().state_map();
-    GeolocationContentSettingsMap* settings_map =
-        profile()->GetGeolocationContentSettingsMap();
+    HostContentSettingsMap* settings_map =
+        profile()->GetHostContentSettingsMap();
+
     for (GeolocationSettingsState::StateMap::const_iterator it =
          state_map.begin(); it != state_map.end(); ++it) {
-      settings_map->SetContentSetting(it->first, embedder_url,
-                                      CONTENT_SETTING_DEFAULT);
+      settings_map->SetContentSetting(
+          ContentSettingsPattern::FromURLNoWildcard(it->first),
+          ContentSettingsPattern::FromURLNoWildcard(embedder_url),
+          CONTENT_SETTINGS_TYPE_GEOLOCATION,
+          std::string(),
+          CONTENT_SETTING_DEFAULT);
     }
   }
 };
 
 // static
 ContentSettingBubbleModel*
     ContentSettingBubbleModel::CreateContentSettingBubbleModel(
         Browser* browser,
         TabContentsWrapper* tab_contents,
         Profile* profile,
@@ skipping 63 matching lines @@
       tab_contents_ = NULL;
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED:
       DCHECK(source == Source<Profile>(profile_));
       profile_ = NULL;
       break;
     default:
       NOTREACHED();
   }
 }