diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/testing_profile.cc | 29 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 5 |
2 files changed, 3 insertions, 31 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index f9d4924..27708f2 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -7,7 +7,6 @@ #include "build/build_config.h" #include "base/command_line.h" #include "base/string_util.h" -#include "chrome/common/url_constants.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/history/history_backend.h" @@ -110,28 +109,6 @@ class TestURLRequestContextGetter : public URLRequestContextGetter { scoped_refptr<URLRequestContext> context_; }; -class TestExtensionURLRequestContext : public URLRequestContext { - public: - TestExtensionURLRequestContext() { - net::CookieMonster* cookie_monster = new net::CookieMonster(NULL); - const char* schemes[] = {chrome::kExtensionScheme}; - cookie_monster->SetCookieableSchemes(schemes, 1); - cookie_store_ = cookie_monster; - } -}; - -class TestExtensionURLRequestContextGetter : public URLRequestContextGetter { - public: - virtual URLRequestContext* GetURLRequestContext() { - if (!context_) - context_ = new TestExtensionURLRequestContext(); - return context_.get(); - } - - private: - scoped_refptr<URLRequestContext> context_; -}; - } // namespace TestingProfile::TestingProfile() @@ -300,12 +277,6 @@ void TestingProfile::CreateRequestContext() { request_context_ = new TestURLRequestContextGetter(); } -URLRequestContextGetter* TestingProfile::GetRequestContextForExtensions() { - if (!extensions_request_context_) - extensions_request_context_ = new TestExtensionURLRequestContextGetter(); - return extensions_request_context_.get(); -} - void TestingProfile::set_session_service(SessionService* session_service) { session_service_ = session_service; } 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. |