diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
6 files changed, 18 insertions, 13 deletions
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h index 5c50c7c..7fe4a7d 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.h +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/browser.h" +#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" -#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" // Base class which contains a valid Browser*. Lots of boilerplate to // recycle between unit test classes. @@ -58,14 +58,14 @@ class CocoaProfileTest : public CocoaTest { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfileManager profile_manager_; TestingProfile* profile_; // Weak; owned by profile_manager_. scoped_ptr<Browser> browser_; - scoped_ptr<BrowserThread> file_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; }; #endif // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index d816f40..46f85d5 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -6,13 +6,16 @@ #include "chrome/browser/browser_process.h" #include "chrome/test/base/testing_browser_process.h" +#include "content/test/test_browser_thread.h" CocoaProfileTest::CocoaProfileTest() : ui_thread_(BrowserThread::UI, &message_loop_), profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), profile_(NULL), - file_thread_(new BrowserThread(BrowserThread::FILE, &message_loop_)), - io_thread_(new BrowserThread(BrowserThread::IO, &message_loop_)) { + file_thread_(new content::TestBrowserThread(BrowserThread::FILE, + &message_loop_)), + io_thread_(new content::TestBrowserThread(BrowserThread::IO, + &message_loop_)) { } CocoaProfileTest::~CocoaProfileTest() { diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index a9e4136..e5aa259 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm @@ -10,6 +10,7 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "chrome/test/base/testing_profile.h" namespace { @@ -22,7 +23,7 @@ class CollectedCookiesWindowControllerTest } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(CollectedCookiesWindowControllerTest, Construction) { diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 823b450..6a5fb86 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -14,7 +14,7 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/content_settings_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -39,7 +39,7 @@ class ContentSettingBubbleControllerTest virtual ~ContentSettingBubbleControllerTest(); private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; base::mac::ScopedNSAutoreleasePool pool_; }; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index cb40b3b..1461429 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -12,6 +12,7 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" // Subclass balloon controller and mock out the initialization of the RVH. @interface TestBalloonController : BalloonController { @@ -68,8 +69,8 @@ class BalloonControllerTest : public ChromeRenderViewHostTestHarness { } protected: - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<Browser> browser_; scoped_ptr<BalloonCollection> collection_; }; diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index a095e3f..cb44475 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -16,9 +16,9 @@ #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util_mac.h" |