From 37ac95b451ae3cdddf327b9bfc3ba350b149b5ff Mon Sep 17 00:00:00 2001 From: "ajwong@chromium.org" Date: Tue, 23 Jul 2013 23:39:35 +0000 Subject: Correctly integrate StoragePartition into TestingProfile. Until this CL, TestingProfile had 3 distinct URLRequestContexts it would return to the user: one via profile->GetDefaultStoragePartition()->GetRequestContext(), one via profile->GetRequestContext(), and one via profile->GetResourceContext->GetRequestContext(). All of these had different cookie stores. This CL unified them so they all return the one from profile->GetDefaultStoragePartition()->GetRequestContext(). This correctly mimics how production code works. Doing this had a bunch of implications: (1) Removes TestingProfile::CreateRequestContext()/ResetRequestContext() (2) Changes MockRequestContext to share the URLRequestContext with TestingProfile. (3) TestingProfile now requires all BrowserThreads. Point (3) effectively adds TestBrowserThreadBundle into a bunch more spots. Because of that, we also have the following changes: (a) AshTestBase now has a TestBrowserThreadBundle (b) Removed a bunch of real threads from tests. (c) TemplateUrlService has reworked synchronization semantics. (d) Removed MultiThreadTestHelper. (e) Added TestingIOThread class + testing API in IOThread to mock out various IO thread tasks which enervated with the new TestBrowserThreadBundle. TBR=bauerb,brettw,isherman,joth,jyasskin,mattm,mmenke,mnissler,pkasting,rkc,rlp,satorux,tim,xians,joth BUG=159193 Review URL: https://chromiumcodereview.appspot.com/17127002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213272 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_protocols_unittest.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome/browser/extensions/extension_protocols_unittest.cc') diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index 0e41a0d..2a2ae7c 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc @@ -86,7 +86,8 @@ scoped_refptr CreateTestResponseHeaderExtension() { class ExtensionProtocolTest : public testing::Test { public: ExtensionProtocolTest() - : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} + : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), + resource_context_(&test_url_request_context_) {} virtual void SetUp() OVERRIDE { testing::Test::SetUp(); @@ -128,6 +129,7 @@ class ExtensionProtocolTest : public testing::Test { net::URLRequestJobFactoryImpl job_factory_; const net::URLRequestJobFactory* old_factory_; net::TestDelegate test_delegate_; + net::TestURLRequestContext test_url_request_context_; content::MockResourceContext resource_context_; }; -- cgit v1.1