summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.cc
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 01:34:14 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 01:34:14 +0000
commit687c5ac1a02ba5b75150713ac3c70cf5875d6273 (patch)
tree4b361de9329d354aac5aa358f2b075098ebde049 /chrome/test/testing_profile.cc
parent4f3edf1d4231f09d486adbb56172ac6391589236 (diff)
downloadchromium_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.cc')
-rw-r--r--chrome/test/testing_profile.cc29
1 files changed, 0 insertions, 29 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;
}