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 /chrome/test/base/view_event_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 'chrome/test/base/view_event_test_base.h')
| -rw-r--r-- | chrome/test/base/view_event_test_base.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h index a139f26..c6c7be7 100644 --- a/chrome/test/base/view_event_test_base.h +++ b/chrome/test/base/view_event_test_base.h @@ -15,7 +15,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.h" +#include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/widget/widget_delegate.h" @@ -141,9 +141,7 @@ class ViewEventTestBase : public views::WidgetDelegate, // Thread for posting background MouseMoves. scoped_ptr<base::Thread> dnd_thread_; - base::MessageLoopForUI message_loop_; - - content::TestBrowserThread ui_thread_; + content::TestBrowserThreadBundle thread_bundle_; #if defined(OS_WIN) ui::ScopedOleInitializer ole_initializer_; |