diff options
Diffstat (limited to 'chrome/browser/ui')
77 files changed, 130 insertions, 120 deletions
diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 0b4e3a2..6d1aa8d 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -14,18 +14,18 @@ #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/signin_manager.h" +#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 7e703ef..9ca04f9a 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -31,8 +31,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/net/crl_set_fetcher.h" #include "chrome/browser/infobars/infobar_tab_helper.h" +#include "chrome/browser/net/crl_set_fetcher.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -69,11 +69,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/browser_distribution.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" 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" diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc index 9931718..9e64185 100644 --- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc +++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "content/browser/browser_thread.h" class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness { public: @@ -17,7 +17,7 @@ class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness { } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; class ConstrainedWindowCloseTest : public ConstrainedWindow { diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 67f9af9..33ce546 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/chrome_switches.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/gtest/include/gtest/gtest.h" class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness { @@ -41,7 +41,7 @@ class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness { EXPECT_FALSE(bubble_content.manage_link.empty()); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(ContentSettingBubbleModelTest, ImageRadios) { diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index e2c50a9..2709148 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -10,9 +10,9 @@ #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/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "net/base/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,7 +22,7 @@ class ContentSettingImageModelTest : public TabContentsWrapperTestHarness { : ui_thread_(BrowserThread::UI, &message_loop_) {} private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelTest); }; diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index a45913f..6c4bf5a 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index ad61231..a5b0fd7 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/url_constants.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" class FindBackendTest : public TabContentsWrapperTestHarness { public: @@ -21,7 +21,7 @@ class FindBackendTest : public TabContentsWrapperTestHarness { browser_thread_(BrowserThread::UI, &message_loop_) {} private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; }; namespace { diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc index 226cabf..1567f93 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/tabstrip_origin_provider.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" // Dummy implementation that's good enough for the tests; we don't test @@ -50,8 +50,8 @@ class BookmarkBarGtkUnittest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<Browser> browser_; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc index 7563edd..8316d3d 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.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" using base::Time; @@ -47,8 +47,8 @@ class BookmarkEditorGtkTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; BookmarkModel* model_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc index bd9cf29..0b2aa84 100644 --- a/chrome/browser/ui/gtk/certificate_dialogs.cc +++ b/chrome/browser/ui/gtk/certificate_dialogs.cc @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/task.h" #include "chrome/common/net/x509_certificate_model.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 0b8a1fc2..56a5a85 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/gtk/gtk_hig_constants.h" #if defined(TOUCH_UI) diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index f7eee4b..a1dbe87 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -16,9 +16,9 @@ #include "chrome/browser/ui/webui/extension_icon_source.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index f10dfaa..12eaffc 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/shell_integration.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc index b189436..bdfe27a 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc @@ -10,9 +10,9 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" -#include "crypto/crypto_module_blocking_password_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" +#include "crypto/crypto_module_blocking_password_delegate.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/dialogs_common.cc b/chrome/browser/ui/gtk/dialogs_common.cc index 1f0688b..f792f0c 100644 --- a/chrome/browser/ui/gtk/dialogs_common.cc +++ b/chrome/browser/ui/gtk/dialogs_common.cc @@ -12,7 +12,7 @@ #include "base/nix/xdg_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" FilePath* SelectFileDialogImpl::last_saved_path_ = NULL; FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc index bbb412b..6064705 100644 --- a/chrome/browser/ui/gtk/dialogs_gtk.cc +++ b/chrome/browser/ui/gtk/dialogs_gtk.cc @@ -16,7 +16,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/dialogs_common.h" #include "chrome/browser/ui/shell_dialogs.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc index a86502e..9781df8 100644 --- a/chrome/browser/ui/gtk/dialogs_kde.cc +++ b/chrome/browser/ui/gtk/dialogs_kde.cc @@ -23,7 +23,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/dialogs_common.h" #include "chrome/browser/ui/shell_dialogs.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc index 7ff26f8..db4e838 100644 --- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc @@ -7,9 +7,9 @@ #include "base/message_loop.h" #include "chrome/browser/repost_form_warning_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index a1995a9..8a07c1c 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -19,9 +19,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/net/x509_certificate_model.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/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc index 9d82dba..ac487be 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc @@ -20,9 +20,9 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.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 "ui/gfx/codec/png_codec.h" #include "webkit/glue/web_intent_service_data.h" @@ -193,8 +193,8 @@ class WebIntentPickerControllerTest : public TabContentsWrapperTestHarness { MessageLoop::current()->Run(); } - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; WebIntentPickerMock picker_; // |controller_| takes ownership. diff --git a/chrome/browser/ui/intents/web_intents_model_unittest.cc b/chrome/browser/ui/intents/web_intents_model_unittest.cc index 75923d2..bf1fc15 100644 --- a/chrome/browser/ui/intents/web_intents_model_unittest.cc +++ b/chrome/browser/ui/intents/web_intents_model_unittest.cc @@ -5,11 +5,12 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" #include "base/synchronization/waitable_event.h" -#include "base/values.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/intents/web_intents_registry.h" -#include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/ui/intents/web_intents_model.h" +#include "chrome/browser/webdata/web_data_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/tree_node_model.h" @@ -66,8 +67,8 @@ class WebIntentsModelTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<WebDataService> wds_; WebIntentsRegistry registry_; ScopedTempDir temp_dir_; diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 0e5135e..4ed400f 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -14,13 +14,13 @@ #include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "net/base/auth.h" diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 15180c4..972d9d2 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -14,10 +14,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "net/base/auth.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc index 97a546d..794ddaa 100644 --- a/chrome/browser/ui/login/login_prompt_gtk.cc +++ b/chrome/browser/ui/login/login_prompt_gtk.cc @@ -14,11 +14,11 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/login/login_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index 99868e0..071e5ac 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -14,10 +14,10 @@ #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/login/login_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index a112a00..c1d8dbb 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -10,11 +10,11 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/browser/ui/views/login_view.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/shell_dialogs_unittest.cc b/chrome/browser/ui/shell_dialogs_unittest.cc index 8656485..0344dfc 100644 --- a/chrome/browser/ui/shell_dialogs_unittest.cc +++ b/chrome/browser/ui/shell_dialogs_unittest.cc @@ -7,13 +7,14 @@ #include "base/string16.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/browser_prefs.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" -#include "chrome/common/pref_names.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class FileSelectionUser : public SelectFileDialog::Listener { @@ -73,7 +74,7 @@ typedef testing::Test FileSelectionDialogTest; // file-selection dialogs disabled by policy. TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); ScopedTestingLocalState local_state( static_cast<TestingBrowserProcess*>(g_browser_process)); diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index 9267b50..7011399 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -13,11 +13,11 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" @@ -99,7 +99,7 @@ class BackFwdMenuModelTest : public ChromeRenderViewHostTestHarness { contents()->CommitPendingNavigation(); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(BackFwdMenuModelTest, BasicCase) { diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc index a3379ad..f521b17 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class EncodingMenuControllerTest : public testing::Test { @@ -20,7 +21,7 @@ class EncodingMenuControllerTest : public testing::Test { : ui_thread_(BrowserThread::UI, &message_loop_) {} private: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(EncodingMenuControllerTest, EncodingIDsBelongTest) { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 7fe3804..0bf9d01 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -23,6 +23,7 @@ #include "chrome/test/base/view_event_test_base.h" #include "content/browser/tab_contents/page_navigator.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" @@ -290,8 +291,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { gfx::Size bb_view_pref_; scoped_ptr<TestingProfile> profile_; scoped_ptr<Browser> browser_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; ViewsDelegateImpl views_delegate_; }; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc index b0f8ea1..c9c842b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc @@ -14,8 +14,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/page_navigator.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" @@ -82,8 +82,8 @@ class BookmarkContextMenuTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; BookmarkModel* model_; TestingPageNavigator navigator_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 9bf17a7..5a0299b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.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" using base::Time; @@ -88,8 +88,8 @@ class BookmarkEditorViewTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; BookmarkModel* model_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/ui/views/file_manager_dialog.cc b/chrome/browser/ui/views/file_manager_dialog.cc index cea379f..c3dde25 100644 --- a/chrome/browser/ui/views/file_manager_dialog.cc +++ b/chrome/browser/ui/views/file_manager_dialog.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "chrome/browser/ui/views/window.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 6cb981a..80da6ef 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -19,8 +19,8 @@ #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/shell_dialogs_aura.cc b/chrome/browser/ui/views/shell_dialogs_aura.cc index 3e9c0cb..365fb4b 100644 --- a/chrome/browser/ui/views/shell_dialogs_aura.cc +++ b/chrome/browser/ui/views/shell_dialogs_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/shell_dialogs.h" #include "chrome/browser/ui/views/file_manager_dialog.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // static SelectFileDialog* SelectFileDialog::Create(Listener* listener) { diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index 36531b7..1ddb1dd 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index c164409..eb7b08f 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -11,8 +11,8 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" -#include "content/browser/browser_thread.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.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index 8eac87b..d8efac1 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -21,10 +21,10 @@ #include "chrome/browser/tab_contents/web_drop_target_win.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/drag_download_file.h" #include "content/browser/download/drag_download_util.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "net/base/net_util.h" #include "views/drag_utils.h" diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index bc70cb8..70712d9 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -12,11 +12,11 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc index 572df64..7a1b428 100644 --- a/chrome/browser/ui/webui/bug_report_ui.cc +++ b/chrome/browser/ui/webui/bug_report_ui.cc @@ -25,8 +25,8 @@ #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index 35af8b5..408de1d 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -17,7 +17,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/platform_locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index f15bcc7..b7a5881 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -25,7 +25,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/url_util.h" #include "grit/platform_locale_settings.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index c205328..cd73de7 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -20,8 +20,8 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 4ff9ba9..e61afe8 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -18,7 +18,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc index b604707..c13f882 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc @@ -10,8 +10,8 @@ #include "base/task.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_types.h" +#include "content/public/browser/browser_thread.h" namespace imageburner { diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 43dadf3..512a1d9 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -17,8 +17,8 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 0dcb333..a640b0e 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -33,9 +33,9 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index 5cebaa2..b6ad5fe 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -23,8 +23,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index ab9cc7c..ae0da5c 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -20,8 +20,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index 25d11db..86273ab 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -22,8 +22,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 73a821d..e666094 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -12,10 +12,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/devtools_messages.h" +#include "content/public/browser/browser_thread.h" #include "grit/devtools_resources_map.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 5cc861b..c4af116 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -36,7 +36,7 @@ #include "ui/gfx/image/image.h" #if !defined(OS_MACOSX) -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #endif namespace { diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index a1a2c24..d769460 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_data_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/angle/src/common/version.h" diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc index e664786..910f9e4 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media/media_internals_handler.cc @@ -9,9 +9,9 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/media/media_internals_proxy.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" MediaInternalsMessageHandler::MediaInternalsMessageHandler() : proxy_(new MediaInternalsProxy()) {} diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.h b/chrome/browser/ui/webui/media/media_internals_proxy.h index 3159736..6350a3b 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.h +++ b/chrome/browser/ui/webui/media/media_internals_proxy.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "chrome/browser/media/media_internals_observer.h" #include "chrome/browser/net/chrome_net_log.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index 302267b..0e24eee 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -40,7 +40,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc index 86920ae..e4f575f 100644 --- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc @@ -18,8 +18,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/host_cache.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index a73f731..16cb991 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -30,8 +30,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 7cc727b..1353623 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -42,10 +42,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 6ba45e8..88cbb79 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -36,8 +36,8 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index ea94932..e67c2bf 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -13,9 +13,9 @@ #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" // Command used to configure GNOME 2 proxy settings. const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL}; diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 668b3a3..7c7dba4 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -29,8 +29,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 46b42d5..ea89ebe 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -15,9 +15,9 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/gtk/certificate_dialogs.h" -#include "content/browser/browser_thread.h" // for FileAccessProvider #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/browser_thread.h" // for FileAccessProvider #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 00b9ec7..d8fa8b7 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -24,13 +24,12 @@ #include "chrome/browser/ui/webui/options/browser_options_handler.h" #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" #include "chrome/browser/ui/webui/options/content_settings_handler.h" -#include "chrome/browser/ui/webui/options/handler_options_handler.h" #include "chrome/browser/ui/webui/options/cookies_view_handler.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" #include "chrome/browser/ui/webui/options/extension_settings_handler.h" #include "chrome/browser/ui/webui/options/font_settings_handler.h" +#include "chrome/browser/ui/webui/options/handler_options_handler.h" #include "chrome/browser/ui/webui/options/import_data_handler.h" -#include "chrome/browser/ui/webui/options/web_intents_settings_handler.h" #include "chrome/browser/ui/webui/options/language_options_handler.h" #include "chrome/browser/ui/webui/options/manage_profile_handler.h" #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" @@ -39,15 +38,16 @@ #include "chrome/browser/ui/webui/options/personal_options_handler.h" #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" #include "chrome/browser/ui/webui/options/stop_syncing_handler.h" +#include "chrome/browser/ui/webui/options/web_intents_settings_handler.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc index 0223677..d859e4c 100644 --- a/chrome/browser/ui/webui/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview_handler.cc @@ -13,10 +13,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/file_util_icu.h" +#include "base/i18n/number_formatting.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" -#include "base/i18n/number_formatting.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" @@ -40,9 +40,9 @@ #include "chrome/browser/ui/webui/print_preview_ui.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/print_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "printing/backend/print_backend.h" #include "printing/metafile.h" #include "printing/metafile_impl.h" diff --git a/chrome/browser/ui/webui/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals_proxy.h index ad43344..7eca9a5 100644 --- a/chrome/browser/ui/webui/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals_proxy.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_manager.h" #include "webkit/quota/quota_types.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 016adc2..0d30a19 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -15,7 +15,7 @@ #include "chrome/common/url_constants.h" #if defined(OS_CHROMEOS) -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #endif static const char kCurrentScreenshotFilename[] = "current"; diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc index 0c66340..442155b 100644 --- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc +++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/profile_mock.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" @@ -66,8 +66,8 @@ class SyncInternalsUITestWithService : public ChromeRenderViewHostTestHarness { { // Needed by |test_sync_internals_ui_|'s constructor. The // message loop is provided by ChromeRenderViewHostTestHarness. - BrowserThread ui_thread_(BrowserThread::UI, - MessageLoopForUI::current()); + content::TestBrowserThread ui_thread_(BrowserThread::UI, + MessageLoopForUI::current()); // |test_sync_internals_ui_|'s constructor triggers all the // expectations above. test_sync_internals_ui_.reset(new TestSyncInternalsUI(contents())); @@ -142,8 +142,8 @@ class SyncInternalsUITestWithoutService { // Needed by |test_sync_internals_ui_|'s constructor. The // message loop is provided by ChromeRenderViewHostTestHarness. - BrowserThread ui_thread_(BrowserThread::UI, - MessageLoopForUI::current()); + content::TestBrowserThread ui_thread_(BrowserThread::UI, + MessageLoopForUI::current()); // |test_sync_internals_ui_|'s constructor triggers all the // expectations above. test_sync_internals_ui_.reset(new TestSyncInternalsUI(contents())); diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 56da3fb..f33b546 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 0e358a0..1355216 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" @@ -51,7 +51,7 @@ class WebUISourcesTest : public testing::Test { } MessageLoop loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<MockThemeSource> theme_source_; @@ -77,7 +77,8 @@ TEST_F(WebUISourcesTest, ThemeSourceImages) { } TEST_F(WebUISourcesTest, ThemeSourceCSS) { - BrowserThread io_thread(BrowserThread::IO, MessageLoop::current()); + content::TestBrowserThread io_thread(BrowserThread::IO, + MessageLoop::current()); // Generating the test data for the NTP CSS would just involve copying the // method, or being super brittle and hard-coding the result (requiring // an update to the unittest every time the CSS template changes), so we diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 091bff4..0bbdfe0 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -8,10 +8,10 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class WebUITest : public TabContentsWrapperTestHarness { @@ -77,7 +77,7 @@ class WebUITest : public TabContentsWrapperTestHarness { } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(WebUITest); }; |