diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 01:34:14 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 01:34:14 +0000 |
| commit | 687c5ac1a02ba5b75150713ac3c70cf5875d6273 (patch) | |
| tree | 4b361de9329d354aac5aa358f2b075098ebde049 /chrome/test/testing_profile.h | |
| parent | 4f3edf1d4231f09d486adbb56172ac6391589236 (diff) | |
| download | chromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.zip chromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.tar.gz chromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.tar.bz2 | |
Reverts 42520 and 42477. It back red again when adding this change back.
TEST=valgrind test: unit should turn green
BUG=38398
BUG=39177
Review URL: http://codereview.chromium.org/1313003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index ce1603d..08e02b7 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -179,7 +179,9 @@ class TestingProfile : public Profile { void CreateRequestContext(); virtual URLRequestContextGetter* GetRequestContextForMedia() { return NULL; } - virtual URLRequestContextGetter* GetRequestContextForExtensions(); + virtual URLRequestContextGetter* GetRequestContextForExtensions() { + return NULL; + } virtual net::SSLConfigService* GetSSLConfigService() { return NULL; } virtual Blacklist* GetPrivacyBlacklist() { return NULL; } @@ -301,7 +303,6 @@ class TestingProfile : public Profile { // Internally, this is a TestURLRequestContextGetter that creates a dummy // request context. Currently, only the CookieMonster is hooked up. scoped_refptr<URLRequestContextGetter> request_context_; - scoped_refptr<URLRequestContextGetter> extensions_request_context_; // Do we have a history service? This defaults to the value of // history_service, but can be explicitly set. |