diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/browser_with_test_window_test.h | 6 | ||||
| -rw-r--r-- | chrome/test/base/in_process_browser_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/test_url_request_context_getter.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 4 | ||||
| -rw-r--r-- | chrome/test/base/thread_observer_helper.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h index fc70d95..514c394 100644 --- a/chrome/test/base/browser_with_test_window_test.h +++ b/chrome/test/base/browser_with_test_window_test.h @@ -10,8 +10,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class GURL; @@ -97,8 +97,8 @@ class BrowserWithTestWindowTest : public testing::Test { private: // We need to create a MessageLoop, otherwise a bunch of things fails. MessageLoopForUI ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<TestBrowserWindow> window_; diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index d7df59e..92df821 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -29,12 +29,12 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/renderer/mock_content_renderer_client.h" +#include "content/test/test_browser_thread.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" diff --git a/chrome/test/base/test_url_request_context_getter.cc b/chrome/test/base/test_url_request_context_getter.cc index 91c7649..c3c84aa 100644 --- a/chrome/test/base/test_url_request_context_getter.cc +++ b/chrome/test/base/test_url_request_context_getter.cc @@ -4,7 +4,7 @@ #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_test_util.h" TestURLRequestContextGetter::TestURLRequestContextGetter() {} 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; diff --git a/chrome/test/base/thread_observer_helper.h b/chrome/test/base/thread_observer_helper.h index b6fe3f1..4c22123 100644 --- a/chrome/test/base/thread_observer_helper.h +++ b/chrome/test/base/thread_observer_helper.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/test/notification_observer_mock.h" |