diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 23:39:35 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 23:39:35 +0000 |
| commit | 37ac95b451ae3cdddf327b9bfc3ba350b149b5ff (patch) | |
| tree | e4f65b78b410d48cb7ff06c0193fb34980e5334b /ash/test/ash_test_base.h | |
| parent | b785a42692ee2b57600f8b2df66f785387d3f7c0 (diff) | |
| download | chromium_src-37ac95b451ae3cdddf327b9bfc3ba350b149b5ff.zip chromium_src-37ac95b451ae3cdddf327b9bfc3ba350b149b5ff.tar.gz chromium_src-37ac95b451ae3cdddf327b9bfc3ba350b149b5ff.tar.bz2 | |
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
Diffstat (limited to 'ash/test/ash_test_base.h')
| -rw-r--r-- | ash/test/ash_test_base.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index 830001c..62afcd8 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" +#include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/window_types.h" @@ -54,8 +55,6 @@ class AshTestBase : public testing::Test { AshTestBase(); virtual ~AshTestBase(); - base::MessageLoopForUI* message_loop() { return &message_loop_; } - // testing::Test: virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; @@ -114,7 +113,7 @@ class AshTestBase : public testing::Test { private: bool setup_called_; bool teardown_called_; - base::MessageLoopForUI message_loop_; + content::TestBrowserThreadBundle thread_bundle_; scoped_ptr<AshTestHelper> ash_test_helper_; scoped_ptr<aura::test::EventGenerator> event_generator_; #if defined(OS_WIN) |