diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:44:49 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:44:49 +0000 |
| commit | c38831a108f9f905ce9e68503ee67274939cc950 (patch) | |
| tree | 7c93c8afd386fdc11a0f03855cee62c2d3449d63 /chrome/test/base/testing_profile.cc | |
| parent | 75c753a51b150912055d7a8305cf77134d24816a (diff) | |
| download | chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.zip chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.tar.gz chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.tar.bz2 | |
Split BrowserThread into public API and private implementation, step 1.
Only content/ now has the ability to create BrowserThread objects,
with the exception that tests can create the
content::TestBrowserThread subclass, and (temporarily) code in chrome/
can create the DeprecatedBrowserThread subclass.
A follow-up change will make content/ take care of its own thread
creation, remove DeprecatedBrowserThread, and move all state and
non-trivial constructors from BrowserThread down to BrowserThreadImpl.
Also moved BrowserProcessSubThread into content/ namespace. As part
of follow-up cleanup, chrome/ will stop using this class.
BUG=98716
TEST=existing
Review URL: http://codereview.chromium.org/8392042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_profile.cc')
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 0fe3bf2..e5f677c 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -48,9 +48,9 @@ #include "chrome/test/base/test_url_request_context_getter.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/mock_resource_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" @@ -59,8 +59,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "webkit/database/database_tracker.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/quota/quota_manager.h" #include "webkit/quota/mock_quota_manager.h" +#include "webkit/quota/quota_manager.h" using base::Time; using testing::NiceMock; |