diff options
Diffstat (limited to 'chrome/browser/intents')
-rw-r--r-- | chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc | 4 | ||||
-rw-r--r-- | chrome/browser/intents/web_intents_registry_unittest.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc index 32dcfac..f13920b 100644 --- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc +++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/web_intent_service_data.h" @@ -54,7 +54,7 @@ class RegisterIntentHandlerInfoBarDelegateTest MockWebIntentsRegistry* web_intents_registry_; private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(RegisterIntentHandlerInfoBarDelegateTest); }; diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc index b2d0e05..6aaa541 100644 --- a/chrome/browser/intents/web_intents_registry_unittest.cc +++ b/chrome/browser/intents/web_intents_registry_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_paths.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -131,8 +132,8 @@ class WebIntentsRegistryTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<WebDataService> wds_; MockExtensionService extensionService_; ExtensionList extensions_; |