diff options
23 files changed, 126 insertions, 87 deletions
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc index 4df4a6e..bb1cb9b 100644 --- a/content/browser/appcache/chrome_appcache_service_unittest.cc +++ b/content/browser/appcache/chrome_appcache_service_unittest.cc @@ -6,8 +6,8 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/appcache/appcache_database.h" #include "webkit/appcache/appcache_storage_impl.h" @@ -16,6 +16,8 @@ #include <set> +using content::BrowserThreadImpl; + namespace { const FilePath::CharType kTestingAppCacheDirname[] = FILE_PATH_LITERAL("Application Cache"); @@ -56,10 +58,10 @@ class ChromeAppCacheServiceTest : public testing::Test { const GURL kSessionOnlyManifestURL; private: - content::TestBrowserThread db_thread_; - content::TestBrowserThread file_thread_; - content::TestBrowserThread cache_thread_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl db_thread_; + BrowserThreadImpl file_thread_; + BrowserThreadImpl cache_thread_; + BrowserThreadImpl io_thread_; }; scoped_refptr<ChromeAppCacheService> diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc index ee518c3..e14b618 100644 --- a/content/browser/download/base_file_unittest.cc +++ b/content/browser/download/base_file_unittest.cc @@ -10,12 +10,14 @@ #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/test/test_file_util.h" -#include "content/test/test_browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "net/base/file_stream.h" #include "net/base/mock_file_stream.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + namespace { const char kTestData1[] = "Let's write some data to the file!\n"; @@ -162,7 +164,7 @@ class BaseFileTest : public testing::Test { // Mock file thread to satisfy debug checks in BaseFile. MessageLoop message_loop_; - content::TestBrowserThread file_thread_; + BrowserThreadImpl file_thread_; }; // Test the most basic scenario: just create the object and do a sanity check diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index 4d42171..e91eabb 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -5,6 +5,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" #include "content/browser/download/download_id.h" @@ -14,11 +15,12 @@ #include "content/browser/download/download_status_updater.h" #include "content/browser/download/mock_download_manager.h" #include "content/browser/download/mock_download_manager_delegate.h" -#include "content/test/test_browser_thread.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain"; class DownloadFileTest : public testing::Test { @@ -113,9 +115,9 @@ class DownloadFileTest : public testing::Test { MessageLoop loop_; scoped_refptr<DownloadIdFactory> id_factory_; // UI thread. - content::TestBrowserThread ui_thread_; + BrowserThreadImpl ui_thread_; // File thread to satisfy debug checks in DownloadFile. - content::TestBrowserThread file_thread_; + BrowserThreadImpl file_thread_; // Keep track of what data should be saved to the disk file. std::string expected_data_; diff --git a/content/browser/download/download_id_unittest.cc b/content/browser/download/download_id_unittest.cc index 4caa9fe..10ab808 100644 --- a/content/browser/download/download_id_unittest.cc +++ b/content/browser/download/download_id_unittest.cc @@ -9,11 +9,13 @@ #include <set> #include <vector> +#include "content/browser/browser_thread_impl.h" #include "content/browser/download/mock_download_manager.h" #include "content/browser/download/mock_download_manager_delegate.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + class DownloadIdTest : public testing::Test { public: DownloadIdTest() @@ -47,7 +49,7 @@ class DownloadIdTest : public testing::Test { scoped_refptr<DownloadManager> download_managers_[2]; MessageLoopForUI message_loop_; // Necessary to delete |DownloadManager|s. - content::TestBrowserThread ui_thread_; + BrowserThreadImpl ui_thread_; size_t num_managers_; DISALLOW_COPY_AND_ASSIGN(DownloadIdTest); diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index d8750e7..4742ac9 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -9,14 +9,16 @@ #include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/download/save_package.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + #define FPL FILE_PATH_LITERAL #if defined(OS_WIN) #define HTML_EXTENSION ".htm" @@ -119,7 +121,7 @@ class SavePackageTest : public RenderViewHostTestHarness { } private: - content::TestBrowserThread browser_thread_; + BrowserThreadImpl browser_thread_; // SavePackage for successfully generating file name. scoped_refptr<SavePackage> save_package_success_; diff --git a/content/browser/geolocation/gps_location_provider_unittest_linux.cc b/content/browser/geolocation/gps_location_provider_unittest_linux.cc index 3116cf3..b8b8894 100644 --- a/content/browser/geolocation/gps_location_provider_unittest_linux.cc +++ b/content/browser/geolocation/gps_location_provider_unittest_linux.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/browser/browser_thread_impl.h" #include "content/browser/geolocation/gps_location_provider_linux.h" #include "content/browser/geolocation/libgps_wrapper_linux.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + struct gps_data_t { }; @@ -66,7 +68,7 @@ class GeolocationGpsProviderLinuxTests : public testing::Test { protected: MessageLoop message_loop_; - content::TestBrowserThread ui_thread_; + BrowserThreadImpl ui_thread_; LocaionProviderListenerLoopQuitter location_listener_; scoped_ptr<GpsLocationProviderLinux> provider_; }; diff --git a/content/browser/in_process_webkit/dom_storage_unittest.cc b/content/browser/in_process_webkit/dom_storage_unittest.cc index d3438c5..7f37f02 100644 --- a/content/browser/in_process_webkit/dom_storage_unittest.cc +++ b/content/browser/in_process_webkit/dom_storage_unittest.cc @@ -4,12 +4,14 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/quota/mock_special_storage_policy.h" +using content::BrowserThreadImpl; + class DOMStorageTest : public testing::Test { public: DOMStorageTest() @@ -21,7 +23,7 @@ class DOMStorageTest : public testing::Test { MessageLoop message_loop_; private: - content::TestBrowserThread webkit_thread_; + BrowserThreadImpl webkit_thread_; }; TEST_F(DOMStorageTest, SessionOnly) { diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc index 38f8cc2..9a1ff60 100644 --- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc @@ -11,19 +11,21 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/scoped_temp_dir.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/in_process_webkit/indexed_db_context.h" #include "content/browser/in_process_webkit/indexed_db_quota_client.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/database/database_util.h" + // Declared to shorten the line lengths. static const quota::StorageType kTemp = quota::kStorageTypeTemporary; static const quota::StorageType kPerm = quota::kStorageTypePersistent; using namespace webkit_database; +using content::BrowserThreadImpl; // Base class for our test fixtures. class IndexedDBQuotaClientTest : public testing::Test { @@ -154,8 +156,8 @@ class IndexedDBQuotaClientTest : public testing::Test { scoped_refptr<IndexedDBContext> idb_context_; base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_; MessageLoop message_loop_; - content::TestBrowserThread webkit_thread_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl webkit_thread_; + BrowserThreadImpl io_thread_; quota::QuotaStatusCode delete_status_; }; diff --git a/content/browser/in_process_webkit/webkit_context_unittest.cc b/content/browser/in_process_webkit/webkit_context_unittest.cc index f03cbef..affe29f 100644 --- a/content/browser/in_process_webkit/webkit_context_unittest.cc +++ b/content/browser/in_process_webkit/webkit_context_unittest.cc @@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/browser/browser_thread_impl.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + class MockDOMStorageContext : public DOMStorageContext { public: MockDOMStorageContext(WebKitContext* webkit_context, @@ -47,8 +49,7 @@ TEST(WebKitContextTest, PurgeMemory) { // Start up a WebKit thread for the WebKitContext to call the // DOMStorageContext on. MessageLoop message_loop(MessageLoop::TYPE_DEFAULT); - content::TestBrowserThread webkit_thread(BrowserThread::WEBKIT, - &message_loop); + BrowserThreadImpl webkit_thread(BrowserThread::WEBKIT, &message_loop); { // Create the contexts. diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index d92eee0..1ed4080 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -9,11 +9,13 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "content/test/test_browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/webplugininfo.h" +using content::BrowserThreadImpl; + class MockPluginLoaderPosix : public PluginLoaderPosix { public: MOCK_METHOD0(LoadPluginsInternal, void(void)); @@ -82,8 +84,8 @@ class PluginLoaderPosixTest : public testing::Test { private: MessageLoopForIO message_loop_; - content::TestBrowserThread file_thread_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl file_thread_; + BrowserThreadImpl io_thread_; scoped_refptr<MockPluginLoaderPosix> plugin_loader_; }; diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc index dd6d303..7813706 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/audio_input_device_manager.h" #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h" -#include "content/test/test_browser_thread.h" #include "media/audio/audio_manager.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -19,6 +19,8 @@ using ::testing::AnyNumber; using ::testing::InSequence; using ::testing::Return; +using content::BrowserThreadImpl; + namespace media_stream { class MockAudioInputDeviceManagerListener @@ -85,8 +87,8 @@ class AudioInputDeviceManagerTest: public testing::Test { virtual void SetUp() { // The test must run on Browser::IO. message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, - message_loop_.get())); + io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, + message_loop_.get())); manager_.reset(new media_stream::AudioInputDeviceManager()); audio_input_listener_.reset(new MockAudioInputDeviceManagerListener()); manager_->Register(audio_input_listener_.get()); @@ -128,7 +130,7 @@ class AudioInputDeviceManagerTest: public testing::Test { message_loop_->Run(); } scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<BrowserThreadImpl> io_thread_; scoped_ptr<AudioInputDeviceManager> manager_; scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_; diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc index 36b29e2..5b625a8 100644 --- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc +++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc @@ -8,11 +8,11 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/sync_socket.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/media/audio_renderer_host.h" #include "content/browser/renderer_host/media/mock_media_observer.h" #include "content/common/media/audio_messages.h" -#include "content/test/test_browser_thread.h" #include "ipc/ipc_message_utils.h" #include "media/audio/audio_manager.h" #include "media/audio/fake_audio_output_stream.h" @@ -28,6 +28,8 @@ using ::testing::Return; using ::testing::SaveArg; using ::testing::SetArgumentPointee; +using content::BrowserThreadImpl; + static const int kStreamId = 50; static bool IsRunningHeadless() { @@ -175,10 +177,10 @@ class AudioRendererHostTest : public testing::Test { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // Claim to be on both the UI and IO threads to pass all the DCHECKS. - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, - message_loop_.get())); - ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, - message_loop_.get())); + io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, + message_loop_.get())); + ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI, + message_loop_.get())); observer_.reset(new MockMediaObserver()); content::MockResourceContext* context = @@ -359,8 +361,8 @@ class AudioRendererHostTest : public testing::Test { scoped_ptr<MockMediaObserver> observer_; scoped_refptr<MockAudioRendererHost> host_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<content::TestBrowserThread> io_thread_; - scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<BrowserThreadImpl> io_thread_; + scoped_ptr<BrowserThreadImpl> ui_thread_; DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest); }; diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index a9afcee..a0d5f0e 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" #include "content/browser/renderer_host/media/media_stream_manager.h" @@ -13,7 +14,6 @@ #include "content/browser/resource_context.h" #include "content/common/media/media_stream_messages.h" #include "content/common/media/media_stream_options.h" -#include "content/test/test_browser_thread.h" #include "ipc/ipc_message_macros.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,6 +23,8 @@ using ::testing::DeleteArg; using ::testing::DoAll; using ::testing::Return; +using content::BrowserThreadImpl; + const int kProcessId = 5; const int kRenderId = 6; const int kPageRequestId = 7; @@ -142,11 +144,11 @@ class MediaStreamDispatcherHostTest : public testing::Test { virtual void SetUp() { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // ResourceContext must be created on UI thread. - ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, - message_loop_.get())); + ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI, + message_loop_.get())); // MediaStreamManager must be created and called on IO thread. - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, - message_loop_.get())); + io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, + message_loop_.get())); // Create a MediaStreamManager instance and hand over pointer to // ResourceContext. @@ -196,8 +198,8 @@ class MediaStreamDispatcherHostTest : public testing::Test { scoped_refptr<MockMediaStreamDispatcherHost> host_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<content::TestBrowserThread> ui_thread_; - scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<BrowserThreadImpl> ui_thread_; + scoped_ptr<BrowserThreadImpl> io_thread_; scoped_ptr<MediaStreamManager> media_stream_manager_; }; diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc index 3bf4de0..ffaa8322 100644 --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc @@ -12,13 +12,13 @@ #include "base/process_util.h" #include "base/stl_util.h" #include "base/stringprintf.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/video_capture_host.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/browser/resource_context.h" #include "content/common/media/video_capture_messages.h" -#include "content/test/test_browser_thread.h" #include "media/video/capture/video_capture_types.h" #include "testing/gmock/include/gmock/gmock.h" @@ -32,6 +32,8 @@ using ::testing::InSequence; using ::testing::Mock; using ::testing::Return; +using content::BrowserThreadImpl; + // Id used to identify the capture session between renderer and // video_capture_host. static const int kDeviceId = 1; @@ -195,12 +197,12 @@ class VideoCaptureHostTest : public testing::Test { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // ResourceContext must be created on the UI thread. - ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, - message_loop_.get())); + ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI, + message_loop_.get())); // MediaStreamManager must be created on the IO thread. - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, - message_loop_.get())); + io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, + message_loop_.get())); // Create a MediaStreamManager instance and hand over pointer to // ResourceContext. @@ -362,8 +364,8 @@ class VideoCaptureHostTest : public testing::Test { private: scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<content::TestBrowserThread> ui_thread_; - scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<BrowserThreadImpl> ui_thread_; + scoped_ptr<BrowserThreadImpl> io_thread_; scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest); diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index 1ec4991..db2510e 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc @@ -10,10 +10,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/media_stream_provider.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/common/media/media_stream_options.h" -#include "content/test/test_browser_thread.h" #include "media/video/capture/video_capture_device.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,6 +23,8 @@ using ::testing::AnyNumber; using ::testing::InSequence; using ::testing::Return; +using content::BrowserThreadImpl; + namespace media_stream { // Listener class used to track progress of VideoCaptureManager test @@ -82,8 +84,8 @@ class VideoCaptureManagerTest : public testing::Test { virtual void SetUp() { listener_.reset(new media_stream::MockMediaStreamProviderListener()); message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, - message_loop_.get())); + io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, + message_loop_.get())); vcm_.reset(new media_stream::VideoCaptureManager()); vcm_->UseFakeDevice(); vcm_->Register(listener_.get()); @@ -121,7 +123,7 @@ class VideoCaptureManagerTest : public testing::Test { scoped_ptr<media_stream::VideoCaptureManager> vcm_; scoped_ptr<media_stream::MockMediaStreamProviderListener> listener_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<BrowserThreadImpl> io_thread_; scoped_ptr<MockFrameObserver> frame_observer_; private: diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 3fc1e00..c38224f 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -6,6 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/timer.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/view_messages.h" @@ -16,13 +17,14 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/test/test_browser_context.h" -#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/canvas_skia.h" using base::TimeDelta; +using content::BrowserThreadImpl; + using WebKit::WebInputEvent; using WebKit::WebMouseWheelEvent; @@ -527,8 +529,7 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_RepaintAck) { // Test that we don't paint when we're hidden, but we still send the ACK. Most // of the rest of the painting is tested in the GetBackingStore* ones. TEST_F(RenderWidgetHostTest, HiddenPaint) { - content::TestBrowserThread ui_thread(BrowserThread::UI, - MessageLoop::current()); + BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current()); // Hide the widget, it should have sent out a message to the renderer. EXPECT_FALSE(host_->is_hidden_); host_->WasHidden(); diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index c6744fb..83eb175 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -5,13 +5,15 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "base/mac/scoped_nsautorelease_pool.h" +#include "content/browser/browser_thread_impl.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" #include "ui/base/test/cocoa_test_event_utils.h" #import "ui/base/test/ui_cocoa_test_helper.h" #include "webkit/plugins/npapi/webplugin.h" +using content::BrowserThreadImpl; + class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness { public: RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {} @@ -88,9 +90,9 @@ TEST_F(RenderWidgetHostViewMacTest, Basic) { // Regression test for http://crbug.com/60318 TEST_F(RenderWidgetHostViewMacTest, FocusAcceleratedView) { // The accelerated view methods want to be called on the UI thread. - scoped_ptr<content::TestBrowserThread> ui_thread_( - new content::TestBrowserThread(BrowserThread::UI, - MessageLoop::current())); + scoped_ptr<BrowserThreadImpl> ui_thread_( + new BrowserThreadImpl(BrowserThread::UI, + MessageLoop::current())); int w = 400, h = 300; gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h); @@ -161,9 +163,9 @@ TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDown) { // Regression test for http://crbug.com/64256 TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDownWithAcceleratedView) { // The accelerated view methods want to be called on the UI thread. - scoped_ptr<content::TestBrowserThread> ui_thread_( - new content::TestBrowserThread(BrowserThread::UI, - MessageLoop::current())); + scoped_ptr<BrowserThreadImpl> ui_thread_( + new BrowserThreadImpl(BrowserThread::UI, + MessageLoop::current())); int w = 400, h = 300; gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h); diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc index 12f335b..b3e282b 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc @@ -10,6 +10,7 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/download/download_id.h" #include "content/browser/download/download_id_factory.h" @@ -23,7 +24,6 @@ #include "content/common/resource_messages.h" #include "content/common/resource_response.h" #include "content/common/view_messages.h" -#include "content/test/test_browser_thread.h" #include "net/base/net_errors.h" #include "net/base/upload_data.h" #include "net/http/http_util.h" @@ -33,6 +33,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webkit/appcache/appcache_interfaces.h" +using content::BrowserThreadImpl; + // TODO(eroman): Write unit tests for SafeBrowsing that exercise // SafeBrowsingResourceHandler. @@ -386,8 +388,8 @@ class ResourceDispatcherHostTest : public testing::Test, } MessageLoopForIO message_loop_; - content::TestBrowserThread ui_thread_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl ui_thread_; + BrowserThreadImpl io_thread_; scoped_refptr<ForwardingFilter> filter_; ResourceDispatcherHost host_; ResourceIPCAccumulator accum_; diff --git a/content/browser/renderer_host/resource_queue_unittest.cc b/content/browser/renderer_host/resource_queue_unittest.cc index cc48914..6a6e36f 100644 --- a/content/browser/renderer_host/resource_queue_unittest.cc +++ b/content/browser/renderer_host/resource_queue_unittest.cc @@ -4,16 +4,17 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/dummy_resource_handler.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/renderer_host/resource_queue.h" -#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; using content::DummyResourceHandler; namespace { @@ -123,8 +124,8 @@ class ResourceQueueTest : public testing::Test, private: MessageLoop message_loop_; - content::TestBrowserThread ui_thread_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl ui_thread_; + BrowserThreadImpl io_thread_; }; TEST_F(ResourceQueueTest, Basic) { diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index b700f58..b550b5b 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -4,8 +4,8 @@ #include "content/browser/resolve_proxy_msg_helper.h" +#include "content/browser/browser_thread_impl.h" #include "content/common/view_messages.h" -#include "content/test/test_browser_thread.h" #include "ipc/ipc_test_sink.h" #include "net/base/net_errors.h" #include "net/proxy/mock_proxy_resolver.h" @@ -13,6 +13,8 @@ #include "net/proxy/proxy_service.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + // This ProxyConfigService always returns "http://pac" as the PAC url to use. class MockProxyConfigService : public net::ProxyConfigService { public: @@ -78,7 +80,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, } MessageLoop message_loop_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl io_thread_; IPC::TestSink test_sink_; }; diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index 0185daf..bd7cff13 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -5,6 +5,7 @@ #include "base/compiler_specific.h" #include "base/stl_util.h" #include "base/string16.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/browsing_instance.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/mock_content_browser_client.h" @@ -19,10 +20,11 @@ #include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "content/test/test_browser_context.h" -#include "content/test/test_browser_thread.h" #include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + namespace { const char kSameAsAnyInstanceURL[] = "about:internets"; @@ -115,7 +117,7 @@ class SiteInstanceTest : public testing::Test { private: MessageLoopForUI message_loop_; - content::TestBrowserThread ui_thread_; + BrowserThreadImpl ui_thread_; SiteInstanceTestBrowserClient browser_client_; content::ContentBrowserClient* old_browser_client_; diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc index 9ffb08b..bd3dd8a00 100644 --- a/content/browser/speech/speech_recognizer_unittest.cc +++ b/content/browser/speech/speech_recognizer_unittest.cc @@ -4,14 +4,16 @@ #include <vector> +#include "content/browser/browser_thread_impl.h" #include "content/browser/speech/speech_recognizer.h" -#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "media/audio/test_audio_input_controller_factory.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" +using content::BrowserThreadImpl; + using media::AudioInputController; using media::TestAudioInputController; using media::TestAudioInputControllerFactory; @@ -106,7 +108,7 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate, protected: MessageLoopForIO message_loop_; - content::TestBrowserThread io_thread_; + BrowserThreadImpl io_thread_; scoped_refptr<SpeechRecognizer> recognizer_; bool recording_complete_; bool recognition_complete_; diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc index 4dc9cf8..f7f5f6d 100644 --- a/content/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/browser_url_handler.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" @@ -16,12 +17,12 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/common/page_transition_types.h" -#include "content/test/test_browser_thread.h" -#include "content/test/test_browser_thread.h" #include "content/test/test_notification_tracker.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/webkit_glue.h" +using content::BrowserThreadImpl; + class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness { public: void NavigateActiveAndCommit(const GURL& url) { @@ -61,8 +62,7 @@ class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness { // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is // a regression test for bug 9364. TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) { - content::TestBrowserThread ui_thread(BrowserThread::UI, - MessageLoop::current()); + BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current()); const GURL kNtpUrl(chrome::kTestNewTabURL); const GURL kDestUrl("http://www.google.com/"); @@ -121,8 +121,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) { // EnableViewSourceMode message is sent on every navigation regardless // RenderView is being newly created or reused. TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) { - content::TestBrowserThread ui_thread(BrowserThread::UI, - MessageLoop::current()); + BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current()); const GURL kNtpUrl(chrome::kTestNewTabURL); const GURL kUrl("view-source:http://foo"); @@ -274,8 +273,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { // Tests WebUI creation. TEST_F(RenderViewHostManagerTest, WebUI) { - content::TestBrowserThread ui_thread(BrowserThread::UI, - MessageLoop::current()); + BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current()); SiteInstance* instance = SiteInstance::CreateSiteInstance(profile()); TestTabContents tab_contents(profile(), instance); @@ -315,7 +313,7 @@ TEST_F(RenderViewHostManagerTest, WebUI) { // still swap processes if ShouldSwapProcessesForNavigation is true. // Regression test for bug 46290. TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) { - content::TestBrowserThread thread(BrowserThread::UI, &message_loop_); + BrowserThreadImpl thread(BrowserThread::UI, &message_loop_); SiteInstance* instance = SiteInstance::CreateSiteInstance(profile()); TestTabContents tab_contents(profile(), instance); RenderViewHostManager manager(&tab_contents, &tab_contents); |