diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 01:52:45 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 01:52:45 +0000 |
| commit | aee541ebc97e1ff2c8bb43e4375913f582931d40 (patch) | |
| tree | 49e6735353739bef26d1e960738470247ffa0dc8 /chrome/test | |
| parent | 470ad82d83b7773ed5c791a1f3b612087b980eee (diff) | |
| download | chromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.zip chromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.tar.gz chromium_src-aee541ebc97e1ff2c8bb43e4375913f582931d40.tar.bz2 | |
Add GeolocationContentSettingsMap, a geolocation-specific variant of HostContentSettingsMap.
This was originally written by bulach and posted at http://codereview.chromium.org/1033004 ; modified and landed by me.
BUG=37206
TEST=Tested by unittests
TBR=bulach,joth
Review URL: http://codereview.chromium.org/1084005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/testing_profile.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 82535c5..08e02b7 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -12,6 +12,7 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/favicon_service.h" +#include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/history/history.h" #include "chrome/browser/in_process_webkit/webkit_context.h" @@ -190,6 +191,13 @@ class TestingProfile : public Profile { host_content_settings_map_ = new HostContentSettingsMap(this); return host_content_settings_map_.get(); } + virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() { + if (!geolocation_content_settings_map_.get()) { + geolocation_content_settings_map_ = + new GeolocationContentSettingsMap(this); + } + return geolocation_content_settings_map_.get(); + } virtual HostZoomMap* GetHostZoomMap() { return NULL; } void set_session_service(SessionService* session_service); virtual SessionService* GetSessionService() { return session_service_.get(); } @@ -315,6 +323,8 @@ class TestingProfile : public Profile { scoped_refptr<WebKitContext> webkit_context_; scoped_refptr<HostContentSettingsMap> host_content_settings_map_; + scoped_refptr<GeolocationContentSettingsMap> + geolocation_content_settings_map_; }; // A profile that derives from another profile. This does not actually |