diff options
Diffstat (limited to 'chrome/browser/extensions')
66 files changed, 160 insertions, 153 deletions
diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 669b9bb..87fd206 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/protocol/app_notification_specifics.pb.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" typedef std::map<std::string, SyncData> SyncDataMap; diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index d4aff49..97beebe 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -5,10 +5,11 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" -#include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/app_notification.h" +#include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/sync/protocol/app_notification_specifics.pb.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -179,8 +180,8 @@ class AppNotificationManagerSyncTest : public testing::Test { protected: MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; // We keep two TemplateURLServices to test syncing between them. ScopedTempDir temp_dir_; diff --git a/chrome/browser/extensions/app_notification_manager_unittest.cc b/chrome/browser/extensions/app_notification_manager_unittest.cc index 04d5935..f3d588a 100644 --- a/chrome/browser/extensions/app_notification_manager_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_unittest.cc @@ -5,13 +5,14 @@ #include "base/bind.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/app_notification_test_util.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" -#include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace util = app_notification_test_util; @@ -61,8 +62,8 @@ class AppNotificationManagerTest : public testing::Test { } MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; ScopedTempDir temp_dir_; scoped_ptr<TestingProfile> profile_; scoped_refptr<AppNotificationManager> mgr_; diff --git a/chrome/browser/extensions/app_notification_storage.cc b/chrome/browser/extensions/app_notification_storage.cc index d0abeac..f97ed4f 100644 --- a/chrome/browser/extensions/app_notification_storage.cc +++ b/chrome/browser/extensions/app_notification_storage.cc @@ -13,7 +13,7 @@ #include "base/values.h" #include "base/version.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" using base::JSONReader; diff --git a/chrome/browser/extensions/app_notification_storage_unittest.cc b/chrome/browser/extensions/app_notification_storage_unittest.cc index 2fcb251..ef4ab85 100644 --- a/chrome/browser/extensions/app_notification_storage_unittest.cc +++ b/chrome/browser/extensions/app_notification_storage_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/app_notification_storage.h" #include "chrome/browser/extensions/app_notification_test_util.h" #include "chrome/common/extensions/extension_test_util.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace util = app_notification_test_util; @@ -40,7 +40,7 @@ class AppNotificationStorageTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; ScopedTempDir dir_; FilePath storage_path_; scoped_ptr<AppNotificationStorage> storage_; diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc index 8a22cbb..f548ce9 100644 --- a/chrome/browser/extensions/app_notify_channel_setup.cc +++ b/chrome/browser/extensions/app_notify_channel_setup.cc @@ -9,7 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "net/base/escape.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc index 1b3c7408..6b12ec3 100644 --- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc +++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -111,7 +111,7 @@ class AppNotifyChannelSetupTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfile profile_; TestDelegate delegate_; }; diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc index 265959a..545cd77 100644 --- a/chrome/browser/extensions/autoupdate_interceptor.cc +++ b/chrome/browser/extensions/autoupdate_interceptor.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/threading/thread_restrictions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_test_job.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index c348719..dfe55ea 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -32,8 +32,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.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/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_clear_api.cc b/chrome/browser/extensions/extension_clear_api.cc index 07c999f..91f6c1f 100644 --- a/chrome/browser/extensions/extension_clear_api.cc +++ b/chrome/browser/extensions/extension_clear_api.cc @@ -20,7 +20,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace keys = extension_clear_api_constants; diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/extension_content_settings_store.cc index 7b5305e..2677d95a 100644 --- a/chrome/browser/extensions/extension_content_settings_store.cc +++ b/chrome/browser/extensions/extension_content_settings_store.cc @@ -16,7 +16,7 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/extensions/extension_content_settings_api_constants.h" #include "chrome/browser/extensions/extension_content_settings_helpers.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace helpers = extension_content_settings_helpers; namespace keys = extension_content_settings_api_constants; diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc index 7da0448..76d5ed8 100644 --- a/chrome/browser/extensions/extension_cookies_api.cc +++ b/chrome/browser/extensions/extension_cookies_api.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h index cf026a6..546c0d0 100644 --- a/chrome/browser/extensions/extension_data_deleter.h +++ b/chrome/browser/extensions/extension_data_deleter.h @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" namespace webkit_database { diff --git a/chrome/browser/extensions/extension_event_router_forwarder.h b/chrome/browser/extensions/extension_event_router_forwarder.h index 689b436..390c857 100644 --- a/chrome/browser/extensions/extension_event_router_forwarder.h +++ b/chrome/browser/extensions/extension_event_router_forwarder.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" class GURL; diff --git a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc index a128cd6..143d27c 100644 --- a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc +++ b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -65,8 +65,8 @@ class ExtensionEventRouterForwarderTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; TestingProfileManager profile_manager_; scoped_ptr<base::SystemMonitor> dummy; // Profiles are weak pointers, owned by ProfileManager in |browser_process_|. diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc index d8f48ad..0e8eb11 100644 --- a/chrome/browser/extensions/extension_file_browser_private_api.cc +++ b/chrome/browser/extensions/extension_file_browser_private_api.cc @@ -10,12 +10,11 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_process_manager.h" @@ -24,6 +23,7 @@ #include "chrome/browser/extensions/file_manager_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/file_manager_dialog.h" #include "chrome/browser/ui/webui/extension_icon_source.h" @@ -31,14 +31,15 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/pref_names.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/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_mount_point_provider.h" @@ -47,7 +48,6 @@ #include "webkit/fileapi/file_system_path_manager.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_util.h" -#include "ui/base/l10n/l10n_util.h" #ifdef OS_CHROMEOS #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index bbac274..3ab5139 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_ #pragma once -#include <string> #include <list> +#include <string> #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" @@ -16,7 +16,7 @@ #include "base/process.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension.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" #include "ipc/ipc_message.h" diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 0694a85..4d1de40 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/skia_util.h" @@ -57,9 +57,9 @@ class ExtensionIconManagerTest : public testing::Test { bool waiting_; MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; DISALLOW_COPY_AND_ASSIGN(ExtensionIconManagerTest); }; diff --git a/chrome/browser/extensions/extension_info_map.cc b/chrome/browser/extensions/extension_info_map.cc index 50d75d5..401c72d 100644 --- a/chrome/browser/extensions/extension_info_map.cc +++ b/chrome/browser/extensions/extension_info_map.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc index 770e22d..b382ff7 100644 --- a/chrome/browser/extensions/extension_info_map_unittest.cc +++ b/chrome/browser/extensions/extension_info_map_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace keys = extension_manifest_keys; @@ -24,8 +24,8 @@ class ExtensionInfoMapTest : public testing::Test { private: MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; // Returns a barebones test Extension object with the given name. diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 0a4cfc0..576e08cc9 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -18,8 +18,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.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/context_menu.h" @@ -58,8 +58,8 @@ class ExtensionMenuManagerTest : public testing::Test { protected: TestingProfile profile_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; ExtensionMenuManager manager_; ExtensionList extensions_; diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 8b484e2..31f5bf1 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -15,10 +15,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_permission_set.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/test/notification_observer_mock.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -82,8 +82,8 @@ class ExtensionPrefsTest : public testing::Test { ExtensionPrefs* prefs() { return prefs_.prefs(); } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; TestExtensionPrefs prefs_; diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 43b86aa..11edff0 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -18,13 +18,13 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/chrome_view_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" namespace { diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 531d3b6..c71801f 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -86,13 +86,13 @@ #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/plugin_process_host.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/user_metrics.h" #include "content/common/pepper_plugin_registry.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 3c26a71..7e5e9f6 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -23,8 +23,8 @@ #include "chrome/browser/extensions/apps_promo.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/browser/extensions/extension_menu_manager.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_permissions_api.h" +#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_settings_frontend.h" #include "chrome/browser/extensions/extension_sync_data.h" @@ -39,8 +39,8 @@ #include "chrome/browser/sync/api/syncable_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "content/browser/browser_thread.h" #include "content/common/property_bag.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/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index b9083a2..145482e 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -54,12 +54,12 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_options.h" @@ -3624,8 +3624,8 @@ TEST(ExtensionServiceTestSimple, Enabledness) { ExtensionsReadyRecorder recorder; scoped_ptr<TestingProfile> profile(new TestingProfile()); MessageLoop loop; - BrowserThread ui_thread(BrowserThread::UI, &loop); - BrowserThread file_thread(BrowserThread::FILE, &loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &loop); scoped_ptr<CommandLine> command_line; FilePath install_dir = profile->GetPath() .AppendASCII(ExtensionService::kInstallDirectoryName); diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index daaf6f1..2c24dfa7 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class ExtensionServiceTestBase : public testing::Test { @@ -52,11 +52,11 @@ class ExtensionServiceTestBase : public testing::Test { ExtensionService* service_; size_t total_successes_; MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; - BrowserThread webkit_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread webkit_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_UNITTEST_H_ diff --git a/chrome/browser/extensions/extension_settings_api.cc b/chrome/browser/extensions/extension_settings_api.cc index 64526d7..27b6be1 100644 --- a/chrome/browser/extensions/extension_settings_api.cc +++ b/chrome/browser/extensions/extension_settings_api.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_settings_api.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { const char* kUnsupportedArgumentType = "Unsupported argument type"; diff --git a/chrome/browser/extensions/extension_settings_backend.cc b/chrome/browser/extensions/extension_settings_backend.cc index 56bd944..63d8f32 100644 --- a/chrome/browser/extensions/extension_settings_backend.cc +++ b/chrome/browser/extensions/extension_settings_backend.cc @@ -17,7 +17,7 @@ #include "chrome/browser/extensions/extension_settings_sync_util.h" #include "chrome/browser/extensions/in_memory_extension_settings_storage.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/leveldatabase/src/include/leveldb/iterator.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/extensions/extension_settings_frontend.cc b/chrome/browser/extensions/extension_settings_frontend.cc index 84bfaac..38cdca4 100644 --- a/chrome/browser/extensions/extension_settings_frontend.cc +++ b/chrome/browser/extensions/extension_settings_frontend.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_settings_backend.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" class ExtensionSettingsFrontend::DefaultObserver diff --git a/chrome/browser/extensions/extension_settings_frontend_unittest.cc b/chrome/browser/extensions/extension_settings_frontend_unittest.cc index d245850..0fca900 100644 --- a/chrome/browser/extensions/extension_settings_frontend_unittest.cc +++ b/chrome/browser/extensions/extension_settings_frontend_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/extensions/extension_settings_storage.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" class ExtensionSettingsFrontendTest : public testing::Test { public: @@ -56,8 +57,8 @@ class ExtensionSettingsFrontendTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) { diff --git a/chrome/browser/extensions/extension_settings_leveldb_storage.cc b/chrome/browser/extensions/extension_settings_leveldb_storage.cc index 647c232..3af3e22 100644 --- a/chrome/browser/extensions/extension_settings_leveldb_storage.cc +++ b/chrome/browser/extensions/extension_settings_leveldb_storage.cc @@ -11,7 +11,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/sys_string_conversions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/leveldatabase/src/include/leveldb/iterator.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/extensions/extension_settings_storage_unittest.h b/chrome/browser/extensions/extension_settings_storage_unittest.h index b78975e..50e29f9 100644 --- a/chrome/browser/extensions/extension_settings_storage_unittest.h +++ b/chrome/browser/extensions/extension_settings_storage_unittest.h @@ -17,7 +17,7 @@ #include "chrome/browser/extensions/extension_settings_backend.h" #include "chrome/browser/extensions/extension_settings_frontend.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" // Parameter type for the value-parameterized tests. typedef ExtensionSettingsStorage* (*ExtensionSettingsStorageTestParam)( @@ -73,8 +73,8 @@ class ExtensionSettingsStorageTest // Need these so that the DCHECKs for running on FILE or UI threads pass. MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_STORAGE_UNITTEST_H_ diff --git a/chrome/browser/extensions/extension_settings_sync_unittest.cc b/chrome/browser/extensions/extension_settings_sync_unittest.cc index 43a50c0..2bc2995 100644 --- a/chrome/browser/extensions/extension_settings_sync_unittest.cc +++ b/chrome/browser/extensions/extension_settings_sync_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/browser/extensions/syncable_extension_settings_storage.h" #include "chrome/browser/sync/api/sync_change_processor.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" // TODO(kalman): Integration tests for sync. @@ -167,8 +167,8 @@ class ExtensionSettingsSyncTest : public testing::Test { // Need these so that the DCHECKs for running on FILE or UI threads pass. MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; MockSyncChangeProcessor sync_; TestingProfile profile_; diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 79ef082..425fcca 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -11,7 +11,7 @@ #include "chrome/common/content_settings_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy( CookieSettings* cookie_settings) diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 892d925..da64328 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace keys = extension_manifest_keys; @@ -217,7 +218,7 @@ TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) { TEST_F(ExtensionSpecialStoragePolicyTest, HasSessionOnlyOrigins) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); TestingProfile profile; CookieSettings* cookie_settings = CookieSettings::GetForProfile(&profile); diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc index c07da6f..63c2fe7 100644 --- a/chrome/browser/extensions/extension_tab_id_map.cc +++ b/chrome/browser/extensions/extension_tab_id_map.cc @@ -8,12 +8,12 @@ #include "base/bind_helpers.h" #include "chrome/browser/sessions/restore_tab_helper.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/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/public/browser/notification_registrar.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 "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 0894af3..6743dfb 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -27,7 +27,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "libxml/globals.h" #include "net/base/escape.h" @@ -316,9 +316,9 @@ class ExtensionUpdaterTest : public testing::Test { static void TestExtensionUpdateCheckRequests(bool pending) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); // Create an extension with an update_url. @@ -385,8 +385,8 @@ class ExtensionUpdaterTest : public testing::Test { // Setup and start the updater. MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); TestURLFetcherFactory factory; @@ -493,8 +493,8 @@ class ExtensionUpdaterTest : public testing::Test { static void TestDetermineUpdates() { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); // Create a set of test extensions ServiceForManifestTests service; @@ -542,7 +542,7 @@ class ExtensionUpdaterTest : public testing::Test { SetupPendingExtensionManagerForTest(3, GURL(), pending_extension_manager); MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); ExtensionUpdater updater( &service, service.extension_prefs(), service.pref_service(), service.profile(), kUpdateFrequencySecs); @@ -570,10 +570,10 @@ class ExtensionUpdaterTest : public testing::Test { static void TestMultipleManifestDownloading() { MessageLoop ui_loop; - BrowserThread ui_thread(BrowserThread::UI, &ui_loop); - BrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread ui_thread(BrowserThread::UI, &ui_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE); file_thread.Start(); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); TestURLFetcherFactory factory; @@ -649,10 +649,10 @@ class ExtensionUpdaterTest : public testing::Test { static void TestSingleExtensionDownloading(bool pending) { MessageLoop ui_loop; - BrowserThread ui_thread(BrowserThread::UI, &ui_loop); - BrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread ui_thread(BrowserThread::UI, &ui_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE); file_thread.Start(); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); TestURLFetcherFactory factory; @@ -715,9 +715,9 @@ class ExtensionUpdaterTest : public testing::Test { static void TestBlacklistDownloading() { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); TestURLFetcherFactory factory; @@ -766,9 +766,9 @@ class ExtensionUpdaterTest : public testing::Test { // UpdateExtension() returns false, signaling install failures. static void TestMultipleExtensionDownloading(bool updates_start_running) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.Start(); TestURLFetcherFactory factory; @@ -933,8 +933,8 @@ class ExtensionUpdaterTest : public testing::Test { bool active_bit, bool expect_brand_code) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); TestURLFetcherFactory factory; @@ -1061,7 +1061,7 @@ class ExtensionUpdaterTest : public testing::Test { static void TestHandleManifestResults() { ServiceForManifestTests service; MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); ExtensionUpdater updater( &service, service.extension_prefs(), service.pref_service(), service.profile(), kUpdateFrequencySecs); @@ -1108,7 +1108,7 @@ TEST_F(ExtensionUpdaterTest, TestBlacklistUpdateCheckRequests) { TEST_F(ExtensionUpdaterTest, TestUpdateUrlData) { MessageLoop message_loop; - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); ExtensionUpdaterTest::TestUpdateUrlDataEmpty(); ExtensionUpdaterTest::TestUpdateUrlDataSimple(); @@ -1164,7 +1164,7 @@ TEST_F(ExtensionUpdaterTest, TestHandleManifestResults) { TEST_F(ExtensionUpdaterTest, TestManifestFetchesBuilderAddExtension) { MessageLoop message_loop; - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); MockService service; ManifestFetchesBuilder builder(&service, service.extension_prefs()); @@ -1213,8 +1213,8 @@ TEST_F(ExtensionUpdaterTest, TestManifestFetchesBuilderAddExtension) { TEST_F(ExtensionUpdaterTest, TestStartUpdateCheckMemory) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); ServiceForManifestTests service; TestURLFetcherFactory factory; @@ -1234,8 +1234,8 @@ TEST_F(ExtensionUpdaterTest, TestStartUpdateCheckMemory) { TEST_F(ExtensionUpdaterTest, TestCheckSoon) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); ServiceForManifestTests service; TestURLFetcherFactory factory; diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index 4a1bc46..537019a 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/global_error_service.h" #include "chrome/browser/ui/global_error_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_webrequest_api.cc b/chrome/browser/extensions/extension_webrequest_api.cc index 144ad03..ad28943 100644 --- a/chrome/browser/extensions/extension_webrequest_api.cc +++ b/chrome/browser/extensions/extension_webrequest_api.cc @@ -31,9 +31,9 @@ #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_message_filter.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/auth.h" diff --git a/chrome/browser/extensions/extensions_quota_service_unittest.cc b/chrome/browser/extensions/extensions_quota_service_unittest.cc index 83d0bce..e85026e 100644 --- a/chrome/browser/extensions/extensions_quota_service_unittest.cc +++ b/chrome/browser/extensions/extensions_quota_service_unittest.cc @@ -6,6 +6,7 @@ #include "base/string_util.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/extensions/extensions_quota_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; @@ -119,7 +120,7 @@ class ExtensionsQuotaServiceTest : public testing::Test { std::string extension_c_; scoped_ptr<ExtensionsQuotaService> service_; MessageLoop loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; class QuotaLimitHeuristicTest : public testing::Test { diff --git a/chrome/browser/extensions/external_extension_loader.cc b/chrome/browser/extensions/external_extension_loader.cc index 53e8ba2..43bd260 100644 --- a/chrome/browser/extensions/external_extension_loader.cc +++ b/chrome/browser/extensions/external_extension_loader.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/values.h" #include "chrome/browser/extensions/external_extension_provider_impl.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" ExternalExtensionLoader::ExternalExtensionLoader() : owner_(NULL), diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc index afe652f..8a5b826 100644 --- a/chrome/browser/extensions/external_extension_provider_impl.cc +++ b/chrome/browser/extensions/external_extension_provider_impl.cc @@ -22,7 +22,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" #if !defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/external_policy_extension_loader.cc b/chrome/browser/extensions/external_policy_extension_loader.cc index def4fa5..fedeada 100644 --- a/chrome/browser/extensions/external_policy_extension_loader.cc +++ b/chrome/browser/extensions/external_policy_extension_loader.cc @@ -8,10 +8,10 @@ #include "base/values.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" -#include "chrome/common/chrome_notification_types.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc index d259711..db8c6bf 100644 --- a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc @@ -8,14 +8,14 @@ #include "base/message_loop.h" #include "base/values.h" #include "base/version.h" -#include "chrome/browser/extensions/external_extension_provider_interface.h" #include "chrome/browser/extensions/external_extension_provider_impl.h" +#include "chrome/browser/extensions/external_extension_provider_interface.h" #include "chrome/browser/extensions/external_policy_extension_loader.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.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" class ExternalPolicyExtensionProviderTest : public testing::Test { @@ -31,7 +31,7 @@ class ExternalPolicyExtensionProviderTest : public testing::Test { // We need these to satisfy BrowserThread::CurrentlyOn(BrowserThread::UI) // checks in ExternalExtensionProviderImpl. MessageLoop loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; class MockExternalPolicyExtensionProviderVisitor diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc index a4561bf..be52493 100644 --- a/chrome/browser/extensions/external_pref_extension_loader.cc +++ b/chrome/browser/extensions/external_pref_extension_loader.cc @@ -12,7 +12,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/extensions/external_registry_extension_loader_win.cc b/chrome/browser/extensions/external_registry_extension_loader_win.cc index ee63956..b67eab1b 100644 --- a/chrome/browser/extensions/external_registry_extension_loader_win.cc +++ b/chrome/browser/extensions/external_registry_extension_loader_win.cc @@ -13,8 +13,8 @@ #include "base/values.h" #include "base/version.h" #include "base/win/registry.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/extensions/external_extension_provider_impl.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc index 1eb2434..a2ed3e6 100644 --- a/chrome/browser/extensions/file_manager_util.cc +++ b/chrome/browser/extensions/file_manager_util.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.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 "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/file_reader.cc b/chrome/browser/extensions/file_reader.cc index 05ee39f..247540d 100644 --- a/chrome/browser/extensions/file_reader.cc +++ b/chrome/browser/extensions/file_reader.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" #include "chrome/common/extensions/extension_resource.h" +#include "content/public/browser/browser_thread.h" FileReader::FileReader(const ExtensionResource& resource, Callback* callback) : resource_(resource), diff --git a/chrome/browser/extensions/file_reader_unittest.cc b/chrome/browser/extensions/file_reader_unittest.cc index 08e5a08..d7d63c0 100644 --- a/chrome/browser/extensions/file_reader_unittest.cc +++ b/chrome/browser/extensions/file_reader_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/extension_test_util.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -24,7 +24,7 @@ class FileReaderTest : public testing::Test { } private: MessageLoop message_loop_; - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; }; class Receiver { diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc index d43ace0..193bd4d 100644 --- a/chrome/browser/extensions/image_loading_tracker.cc +++ b/chrome/browser/extensions/image_loading_tracker.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/file_util.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/browser_thread.h" -#include "chrome/common/chrome_notification_types.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index 6496dd2..e239a61 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.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/size.h" @@ -89,9 +89,9 @@ class ImageLoadingTrackerTest : public testing::Test, int image_loaded_count_; bool quit_in_image_loaded_; MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; }; // Tests asking ImageLoadingTracker to cache pushes the result to the Extension. diff --git a/chrome/browser/extensions/key_identifier_conversion_views.cc b/chrome/browser/extensions/key_identifier_conversion_views.cc index eea2fcb..3a786a2 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/hash_tables.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/keycodes/keyboard_codes.h" #include "views/events/event.h" diff --git a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc index 3dc8d26..d1108b2 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -19,7 +19,7 @@ class KeyEventFromKeyIdentifierTest : public testing::Test { : ui_thread_(BrowserThread::UI, &message_loop_) {} MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(KeyEventFromKeyIdentifierTest, MatchOnIdentifier) { diff --git a/chrome/browser/extensions/network_delay_listener.cc b/chrome/browser/extensions/network_delay_listener.cc index b372c60..e9a7160 100644 --- a/chrome/browser/extensions/network_delay_listener.cc +++ b/chrome/browser/extensions/network_delay_listener.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_view_types.h" #include "chrome/common/extensions/extension.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_service.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index 06a06ce..0185d8b 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // Manages packing an extension on the file thread and reporting the result diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc index c978415..d07170b 100644 --- a/chrome/browser/extensions/pending_extension_manager.cc +++ b/chrome/browser/extensions/pending_extension_manager.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index ba128a6..987eb8b 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -6,8 +6,8 @@ #include <set> -#include "base/bind.h" #include "base/base64.h" +#include "base/bind.h" #include "base/file_util.h" #include "base/file_util_proxy.h" #include "base/json/json_value_serializer.h" @@ -16,7 +16,6 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): delete me. -#include "crypto/signature_verifier.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -26,8 +25,9 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_unpacker.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/public/browser/browser_thread.h" +#include "crypto/signature_verifier.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc index 7dffefa..3243e0a 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_unpacker.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -59,7 +60,8 @@ class SandboxedExtensionUnpackerTest : public testing::Test { public: virtual void SetUp() { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - file_thread_.reset(new BrowserThread(BrowserThread::FILE, &loop_)); + file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE, + &loop_)); // It will delete itself. client_ = new MockSandboxedExtensionUnpackerClient; client_->DelegateToFake(); @@ -157,7 +159,7 @@ class SandboxedExtensionUnpackerTest : public testing::Test { scoped_ptr<ExtensionUnpacker> unpacker_; scoped_refptr<SandboxedExtensionUnpacker> sandboxed_unpacker_; MessageLoop loop_; - scoped_ptr<BrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; }; TEST_F(SandboxedExtensionUnpackerTest, NoCatalogsSuccess) { diff --git a/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc b/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc index a5a92a7..74f9669 100644 --- a/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc +++ b/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile_keyed_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" using namespace speech_input; @@ -607,6 +607,6 @@ void ExtensionSpeechInputManager::StopSucceededOnUIThread() { content::NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_RECORDING_STOPPED, // Guarded by the state_ == kShutdown check. - content::Source<Profile>(profile_), + content::Source<Profile>(profile_), content::Details<std::string>(&extension_id)); } diff --git a/chrome/browser/extensions/syncable_extension_settings_storage.cc b/chrome/browser/extensions/syncable_extension_settings_storage.cc index cf57766..e6e9fe5 100644 --- a/chrome/browser/extensions/syncable_extension_settings_storage.cc +++ b/chrome/browser/extensions/syncable_extension_settings_storage.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/extension_settings_sync_util.h" #include "chrome/browser/sync/api/sync_data.h" #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" SyncableExtensionSettingsStorage::SyncableExtensionSettingsStorage( const scoped_refptr<ObserverListThreadSafe<ExtensionSettingsObserver> >& diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index a8eb444..6dd07cf 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/values.h" #include "base/synchronization/waitable_event.h" +#include "base/values.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" @@ -20,7 +20,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/json_pref_store.h" #include "chrome/test/base/signaling_task.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index db7610d..d7b9937 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc @@ -10,8 +10,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/url_pattern.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index c33fb27..f3ef806 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -18,7 +18,7 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/user_script.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/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 0334a0c..7e494a5 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -14,9 +14,9 @@ #include "base/string_util.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -48,9 +48,9 @@ class UserScriptMasterTest : public testing::Test, // UserScriptMaster posts tasks to the file thread so make the current // thread look like one. - file_thread_.reset(new BrowserThread( + file_thread_.reset(new content::TestBrowserThread( BrowserThread::FILE, MessageLoop::current())); - ui_thread_.reset(new BrowserThread( + ui_thread_.reset(new content::TestBrowserThread( BrowserThread::UI, MessageLoop::current())); } @@ -77,8 +77,8 @@ class UserScriptMasterTest : public testing::Test, // MessageLoop used in tests. MessageLoop message_loop_; - scoped_ptr<BrowserThread> file_thread_; - scoped_ptr<BrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; // Updated to the script shared memory when we get notified. base::SharedMemory* shared_memory_; diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc index c06815a..e2914f5 100644 --- a/chrome/browser/extensions/webstore_install_helper.cc +++ b/chrome/browser/extensions/webstore_install_helper.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/values.h" #include "chrome/common/chrome_utility_messages.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" |