diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 19:27:29 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 19:27:29 +0000 |
| commit | 87fa8441dcbe28f3fef458da43b3fcc1f16e31a3 (patch) | |
| tree | 7b5b555580baed0b909fa52f79922f016f15b30b /chrome/test/base/testing_profile.h | |
| parent | b987e90e17a644bc6157252efbdfe8b16a3b72b3 (diff) | |
| download | chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.zip chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.tar.gz chromium_src-87fa8441dcbe28f3fef458da43b3fcc1f16e31a3.tar.bz2 | |
Migrate geolocation settings to host content settings map and remove the geolocation settings map.
BUG=63656
TEST=host_content_settings_map_unittest.cc,
content_settings_pref_provider_unittest.cc
Review URL: http://codereview.chromium.org/7484072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.h')
| -rw-r--r-- | chrome/test/base/testing_profile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h index 90478f6..8613c34 100644 --- a/chrome/test/base/testing_profile.h +++ b/chrome/test/base/testing_profile.h @@ -6,6 +6,8 @@ #define CHROME_TEST_BASE_TESTING_PROFILE_H_ #pragma once +#include <string> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" @@ -39,7 +41,6 @@ class ExtensionPrefValueMap; class ExtensionSpecialStoragePolicy; class FaviconService; class FindBarState; -class GeolocationContentSettingsMap; class GeolocationPermissionContext; class HistoryService; class HostContentSettingsMap; @@ -215,7 +216,6 @@ class TestingProfile : public Profile { virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher(); virtual FindBarState* GetFindBarState(); virtual HostContentSettingsMap* GetHostContentSettingsMap(); - virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap(); virtual GeolocationPermissionContext* GetGeolocationPermissionContext(); virtual HostZoomMap* GetHostZoomMap(); virtual bool HasProfileSyncService() const; @@ -352,8 +352,6 @@ class TestingProfile : public Profile { scoped_refptr<webkit_database::DatabaseTracker> db_tracker_; scoped_refptr<HostContentSettingsMap> host_content_settings_map_; - scoped_refptr<GeolocationContentSettingsMap> - geolocation_content_settings_map_; scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_; // Find bar state. Created lazily by GetFindBarState(). |