Migrate geolocation settings to host content settings map.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 3423c7d166fe0b077d5db01bd4f556af7bb8e833..f46df11c6aac30c9598dcd78a3964e530563e6d1 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -4,6 +4,10 @@
 
 #include "chrome/browser/profiles/profile_impl.h"
 
+#include <list>
+#include <utility>
+#include <vector>

[sail, 2011/08/10 16:06:51]

Same here, not sure why this is needed.

[markusheintz_, 2011/08/11 12:30:39]

Lint complained that std::list, std::vector and std::pair are
used in this file but not included. So I thought I might add them. But since
they are not related to my change I removed them again.

+
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ -40,7 +44,6 @@
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/shortcuts_backend.h"
 #include "chrome/browser/history/top_sites.h"
@@ -1039,12 +1042,6 @@ HostZoomMap* ProfileImpl::GetHostZoomMap() {
   return host_zoom_map_.get();
 }
 
-GeolocationContentSettingsMap* ProfileImpl::GetGeolocationContentSettingsMap() {
-  if (!geolocation_content_settings_map_.get())
-    geolocation_content_settings_map_ = new GeolocationContentSettingsMap(this);
-  return geolocation_content_settings_map_.get();
-}
-
 GeolocationPermissionContext* ProfileImpl::GetGeolocationPermissionContext() {
   if (!geolocation_permission_context_.get())
     geolocation_permission_context_ =