diff options
Diffstat (limited to 'chrome/browser/sync')
61 files changed, 142 insertions, 139 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h index d0ede4e..c6cb779 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.h +++ b/chrome/browser/sync/abstract_profile_sync_service_test.h @@ -15,7 +15,7 @@ #include "chrome/browser/sync/internal_api/change_record.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class ProfileSyncService; @@ -60,9 +60,9 @@ class AbstractProfileSyncServiceTest : public testing::Test { protected: MessageLoopForUI ui_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; ProfileSyncFactoryMock factory_; scoped_ptr<TokenService> token_service_; scoped_ptr<TestProfileSyncService> service_; diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc index 466717f..27d3211 100644 --- a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc @@ -18,6 +18,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using browser_sync::AppNotificationDataTypeController; @@ -125,8 +126,8 @@ class AppNotificationDataTypeControllerTest } MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<TestAppNotificationDataTypeController> app_notif_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc index f11fb11..bd96339 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/webdata/web_data_service.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_source.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index e954f65..ed4cc96 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -20,9 +20,9 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" using base::WaitableEvent; @@ -155,8 +155,8 @@ class AutofillDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<AutofillDataTypeController> autofill_dtc_; ProfileSyncFactoryMock profile_sync_factory_; ProfileMock profile_; diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc index 902f00a..bc24828 100644 --- a/chrome/browser/sync/glue/autofill_model_associator.cc +++ b/chrome/browser/sync/glue/autofill_model_associator.cc @@ -26,7 +26,7 @@ #include "chrome/browser/webdata/autofill_table.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/guid.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/escape.h" using base::TimeTicks; diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc index bb16a32..25dd9c9 100644 --- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc @@ -15,7 +15,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/webdata/web_data_service.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 "content/public/browser/notification_source.h" diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 864f014..9337105 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -20,7 +20,7 @@ #include "chrome/browser/sync/internal_api/write_node.h" #include "chrome/browser/sync/internal_api/write_transaction.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc index b2f1057..d96fde9 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc @@ -10,7 +10,7 @@ #include "chrome/browser/sync/profile_sync_factory.h" #include "chrome/browser/sync/profile_sync_service.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_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 4e4c231..8b8b0fa 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" using browser_sync::BookmarkDataTypeController; @@ -81,7 +81,7 @@ class BookmarkDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<BookmarkDataTypeController> bookmark_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; ProfileMock profile_; diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index 0e307c1..a30174d 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -22,7 +22,7 @@ #include "chrome/browser/sync/internal_api/write_transaction.h" #include "chrome/browser/sync/util/cryptographer.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.cc b/chrome/browser/sync/glue/browser_thread_model_worker.cc index 9c1abdf..43626c4 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/glue/browser_thread_model_worker.h" #include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using base::WaitableEvent; diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.h b/chrome/browser/sync/glue/browser_thread_model_worker.h index 487e56c..683dd45 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker.h +++ b/chrome/browser/sync/glue/browser_thread_model_worker.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/util/unrecoverable_error_info.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace base { class WaitableEvent; diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc index dd8f613..c0b6472 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc @@ -6,12 +6,12 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/threading/thread.h" #include "base/test/test_timeouts.h" +#include "base/threading/thread.h" #include "base/timer.h" #include "chrome/browser/sync/glue/browser_thread_model_worker.h" #include "chrome/browser/sync/util/unrecoverable_error_info.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::OneShotTimer; @@ -85,9 +85,9 @@ class BrowserThreadModelWorkerTest : public testing::Test { scoped_refptr<BrowserThreadModelWorker> worker_; OneShotTimer<BrowserThreadModelWorkerTest> timer_; - BrowserThread db_thread_; + content::TestBrowserThread db_thread_; MessageLoopForIO io_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; ScopedRunnableMethodFactory<BrowserThreadModelWorkerTest> method_factory_; }; diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index 9dd95c9..448ab80 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/chrome/browser/sync/glue/data_type_controller.h @@ -6,15 +6,15 @@ #define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_CONTROLLER_H__ #pragma once -#include <string> #include <map> +#include <string> #include "base/callback.h" #include "base/location.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/unrecoverable_error_handler.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" class SyncError; diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc index 64c5692..6ea458a 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl.cc @@ -17,9 +17,9 @@ #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/glue/sync_backend_host.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" -#include "content/public/browser/notification_service.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc index e4387fd..91cb078 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc @@ -17,11 +17,11 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" -#include "content/public/browser/notification_details.h" #include "content/test/notification_observer_mock.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -282,7 +282,7 @@ class DataTypeManagerImplTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DataTypeController::TypeMap controllers_; NiceMock<SyncBackendHostMock> backend_; content::NotificationObserverMock observer_; diff --git a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc index 903fa6c..babad4e 100644 --- a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc @@ -8,14 +8,14 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/task.h" -#include "chrome/browser/sync/glue/extension_data_type_controller.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" +#include "chrome/browser/sync/glue/extension_data_type_controller.h" #include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using browser_sync::ExtensionDataTypeController; using browser_sync::ChangeProcessorMock; @@ -73,7 +73,7 @@ class ExtensionDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<ExtensionDataTypeController> extension_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; ProfileMock profile_; diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc index 6c6ea21..03e6a3d 100644 --- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc +++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc @@ -11,7 +11,7 @@ #include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/generic_change_processor.h" #include "chrome/browser/sync/profile_sync_factory.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc index e686024..fde93c1 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/profile_sync_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc index 30b7383..9f2a711 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using browser_sync::ChangeProcessorMock; using browser_sync::DataTypeController; @@ -134,7 +134,7 @@ class FrontendDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<FrontendDataTypeControllerFake> frontend_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; scoped_refptr<FrontendDataTypeControllerMock> dtc_mock_; diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index 95274ce..9290df6 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -6,9 +6,9 @@ #include "base/location.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/api/sync_change.h" #include "chrome/browser/sync/api/sync_error.h" +#include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/internal_api/base_node.h" #include "chrome/browser/sync/internal_api/change_record.h" #include "chrome/browser/sync/internal_api/read_node.h" @@ -16,7 +16,7 @@ #include "chrome/browser/sync/internal_api/write_node.h" #include "chrome/browser/sync/internal_api/write_transaction.h" #include "chrome/browser/sync/unrecoverable_error_handler.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index b19aa49..228418f 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_client.h" #include "content/public/common/url_fetcher.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 6efc1a6..9db450e 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -6,7 +6,7 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/glue/http_bridge.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "net/test/test_server.h" #include "net/url_request/url_request_test_util.h" @@ -84,7 +84,7 @@ class HttpBridgeTest : public testing::Test { TestURLRequestContextGetter* fake_default_request_context_getter_; // Separate thread for IO used by the HttpBridge. - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; MessageLoop loop_; }; diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc index bf2edb4..e76b626 100644 --- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc @@ -5,13 +5,13 @@ #include "chrome/browser/sync/glue/new_non_frontend_data_type_controller.h" #include "base/logging.h" -#include "chrome/browser/sync/profile_sync_factory.h" -#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/glue/shared_change_processor_ref.h" +#include "chrome/browser/sync/profile_sync_factory.h" +#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc index 5f6c566..2ea660d 100644 --- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc @@ -7,10 +7,10 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" #include "base/tracked_objects.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/api/syncable_service_mock.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" @@ -19,7 +19,7 @@ #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::WaitableEvent; @@ -210,8 +210,8 @@ class NewNonFrontendDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; ProfileMock profile_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; ProfileSyncServiceMock service_; diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc index 484270b..3fbf304 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/profile_sync_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc index e1c0c20..b283c3d 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc @@ -7,20 +7,20 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" #include "base/tracked_objects.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" +#include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h" -#include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using base::WaitableEvent; using browser_sync::ChangeProcessorMock; @@ -189,8 +189,8 @@ class NonFrontendDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<NonFrontendDataTypeControllerFake> non_frontend_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; scoped_refptr<NonFrontendDataTypeControllerMock> dtc_mock_; diff --git a/chrome/browser/sync/glue/password_data_type_controller.cc b/chrome/browser/sync/glue/password_data_type_controller.cc index 39031d3..508e9de 100644 --- a/chrome/browser/sync/glue/password_data_type_controller.cc +++ b/chrome/browser/sync/glue/password_data_type_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/profile_sync_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/webdata/web_data_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc index 99f45f2..4404f2e 100644 --- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc @@ -9,14 +9,14 @@ #include "base/message_loop.h" #include "base/task.h" #include "base/tracked_objects.h" -#include "chrome/browser/sync/glue/preference_data_type_controller.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/model_associator_mock.h" +#include "chrome/browser/sync/glue/preference_data_type_controller.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using browser_sync::ChangeProcessorMock; using browser_sync::DataTypeController; @@ -75,7 +75,7 @@ class PreferenceDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<PreferenceDataTypeController> preference_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; ProfileMock profile_; diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc index 4be2076..b1122c1 100644 --- a/chrome/browser/sync/glue/shared_change_processor.cc +++ b/chrome/browser/sync/glue/shared_change_processor.cc @@ -4,11 +4,11 @@ #include "chrome/browser/sync/glue/shared_change_processor.h" -#include "chrome/browser/sync/profile_sync_factory.h" -#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/api/sync_change.h" #include "chrome/browser/sync/glue/generic_change_processor.h" -#include "content/browser/browser_thread.h" +#include "chrome/browser/sync/profile_sync_factory.h" +#include "chrome/browser/sync/profile_sync_service.h" +#include "content/public/browser/browser_thread.h" using base::AutoLock; diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index 8c6d5b5..b8397e7 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -20,19 +20,19 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/http_bridge.h" +#include "chrome/browser/sync/glue/sync_backend_registrar.h" #include "chrome/browser/sync/internal_api/base_transaction.h" #include "chrome/browser/sync/internal_api/read_transaction.h" -#include "chrome/browser/sync/glue/sync_backend_registrar.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/sessions/session_state.h" +#include "chrome/browser/sync/sync_prefs.h" // TODO(tim): Remove this! We should have a syncapi pass-thru instead. #include "chrome/browser/sync/syncable/directory_manager.h" // Cryptographer. -#include "chrome/browser/sync/sync_prefs.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_client.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc index 906050b..fe9852f 100644 --- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc @@ -12,9 +12,10 @@ #include "chrome/browser/sync/protocol/sync_protocol_error.h" #include "chrome/browser/sync/sync_prefs.h" #include "chrome/browser/sync/syncable/model_type.h" +#include "chrome/test/base/test_url_request_context_getter.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/test_url_request_context_getter.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/gmock/include/gmock/gmock.h" @@ -72,8 +73,8 @@ class SyncBackendHostTest : public testing::Test { private: MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(SyncBackendHostTest, InitShutdown) { diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc index de2b055..24f4c0d 100644 --- a/chrome/browser/sync/glue/sync_backend_registrar.cc +++ b/chrome/browser/sync/glue/sync_backend_registrar.cc @@ -11,12 +11,12 @@ #include "base/logging.h" #include "base/message_loop.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/browser_thread_model_worker.h" +#include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/history_model_worker.h" #include "chrome/browser/sync/glue/password_model_worker.h" #include "chrome/browser/sync/glue/ui_model_worker.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc index e47843a..a51ecad 100644 --- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/test/engine/test_user_share.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -67,7 +67,7 @@ class SyncBackendRegistrarTest : public testing::Test { TestUserShare test_user_share_; private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) { @@ -204,7 +204,7 @@ TEST_F(SyncBackendRegistrarTest, ActivateDeactivateUIDataType) { } TEST_F(SyncBackendRegistrarTest, ActivateDeactivateNonUIDataType) { - BrowserThread db_thread(BrowserThread::DB, &loop_); + content::TestBrowserThread db_thread(BrowserThread::DB, &loop_); InSequence in_sequence; TestingProfile profile; SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_); diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc index 247fb6d..928d3fc 100644 --- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc @@ -8,14 +8,14 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/task.h" -#include "chrome/browser/sync/glue/theme_data_type_controller.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/model_associator_mock.h" +#include "chrome/browser/sync/glue/theme_data_type_controller.h" #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using browser_sync::ThemeDataTypeController; using browser_sync::ChangeProcessorMock; @@ -72,7 +72,7 @@ class ThemeDataTypeControllerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<ThemeDataTypeController> theme_dtc_; scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_; ProfileMock profile_; diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc index 195f2cf..845c930 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc index d0af133..f5d548bc 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/glue/typed_url_model_associator.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -419,7 +419,7 @@ static void CreateModelAssociator(base::WaitableEvent* startup, // association on the UI thread, then ensure that AssociateModels() returns // false. TEST_F(TypedUrlModelAssociatorTest, TestAbort) { - BrowserThread db_thread(BrowserThread::DB); + content::TestBrowserThread db_thread(BrowserThread::DB); base::WaitableEvent startup(false, false); base::WaitableEvent aborted(false, false); base::WaitableEvent done(false, false); diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc index 3139929..55fa22a 100644 --- a/chrome/browser/sync/glue/ui_model_worker.cc +++ b/chrome/browser/sync/glue/ui_model_worker.cc @@ -5,9 +5,9 @@ #include "chrome/browser/sync/glue/ui_model_worker.h" #include "base/message_loop.h" -#include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index c904ad3..b71796b 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -11,7 +11,7 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/glue/ui_model_worker.h" #include "chrome/browser/sync/util/unrecoverable_error_info.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using browser_sync::UIModelWorker; @@ -113,7 +113,8 @@ class UIModelWorkerTest : public testing::Test { virtual void SetUp() { faux_syncer_thread_.Start(); - ui_thread_.reset(new BrowserThread(BrowserThread::UI, &faux_ui_loop_)); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + &faux_ui_loop_)); bmw_ = new UIModelWorker(); syncer_.reset(new Syncer(bmw_.get())); } @@ -124,7 +125,7 @@ class UIModelWorkerTest : public testing::Test { base::Thread* syncer_thread() { return &faux_syncer_thread_; } private: MessageLoop faux_ui_loop_; - scoped_ptr<BrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; base::Thread faux_syncer_thread_; base::Thread faux_core_thread_; scoped_refptr<UIModelWorker> bmw_; diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc index d34c4ac..c9e59c9 100644 --- a/chrome/browser/sync/internal_api/syncapi_unittest.cc +++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc @@ -23,8 +23,8 @@ #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/engine/nigori_util.h" -#include "chrome/browser/sync/internal_api/change_record.h" #include "chrome/browser/sync/engine/syncapi_internal.h" +#include "chrome/browser/sync/internal_api/change_record.h" #include "chrome/browser/sync/internal_api/http_post_provider_factory.h" #include "chrome/browser/sync/internal_api/http_post_provider_interface.h" #include "chrome/browser/sync/internal_api/read_node.h" @@ -52,7 +52,7 @@ #include "chrome/browser/sync/util/cryptographer.h" #include "chrome/browser/sync/util/time.h" #include "chrome/test/base/values_test_util.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -824,7 +824,7 @@ class SyncManagerTest : public testing::Test, // Needed by |ui_thread_|. MessageLoopForUI ui_loop_; // Needed by |sync_manager_|. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // Needed by |sync_manager_|. ScopedTempDir temp_dir_; // Sync Id's for the roots of the enabled datatypes. diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc index 1c1e304..6aa1c96 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/cert_verifier.h" @@ -58,7 +58,7 @@ class InvalidationNotifierTest : public testing::Test { StrictMock<MockSyncNotifierObserver> mock_observer_; notifier::FakeBaseTask fake_base_task_; // Since this test calls HostResolver code, we need an IO thread. - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(InvalidationNotifierTest, Basic) { diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc index dab0be5..be5da31 100644 --- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/browser/sync/util/weak_handle.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "jingle/notifier/base/fake_base_task.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -57,7 +57,7 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { } MessageLoop ui_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<net::URLRequestContextGetter> request_context_getter_; scoped_ptr<NonBlockingInvalidationNotifier> invalidation_notifier_; StrictMock<MockSyncNotifierObserver> mock_observer_; diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/chrome/browser/sync/notifier/sync_notifier_factory.cc index 452e1f1..aa636a9 100644 --- a/chrome/browser/sync/notifier/sync_notifier_factory.cc +++ b/chrome/browser/sync/notifier/sync_notifier_factory.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/notifier/p2p_notifier.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "jingle/notifier/base/const_communicator.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/mediator_thread_impl.h" diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc index c219624..007acbb 100644 --- a/chrome/browser/sync/profile_sync_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_factory_impl.cc @@ -33,22 +33,22 @@ #include "chrome/browser/sync/glue/session_data_type_controller.h" #include "chrome/browser/sync/glue/session_model_associator.h" #include "chrome/browser/sync/glue/shared_change_processor.h" -#include "chrome/browser/sync/glue/syncable_service_adapter.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "chrome/browser/sync/glue/syncable_service_adapter.h" #include "chrome/browser/sync/glue/theme_change_processor.h" #include "chrome/browser/sync/glue/theme_data_type_controller.h" #include "chrome/browser/sync/glue/theme_model_associator.h" #include "chrome/browser/sync/glue/typed_url_change_processor.h" #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" #include "chrome/browser/sync/glue/typed_url_model_associator.h" -#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_factory_impl.h" +#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/webdata/autofill_profile_syncable_service.h" #include "chrome/browser/webdata/web_data_service.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" using browser_sync::AppDataTypeController; using browser_sync::AppNotificationDataTypeController; diff --git a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc index c7e4345..8331854 100644 --- a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_switches.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 browser_sync::DataTypeController; @@ -84,7 +84,7 @@ class ProfileSyncFactoryImplTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_ptr<Profile> profile_; scoped_ptr<CommandLine> command_line_; scoped_ptr<ProfileSyncFactoryImpl> profile_sync_service_factory_; diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index 96553ed..e1b9d0f 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -43,8 +43,8 @@ #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/sync/test/engine/test_id_factory.h" +#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_entry.h" #include "chrome/browser/webdata/autofill_profile_syncable_service.h" @@ -52,8 +52,8 @@ #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" using base::Time; diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 1faafef..0c3fb4d 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -34,7 +34,7 @@ #include "chrome/browser/sync/test/engine/test_user_share.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -507,9 +507,9 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { private: // Used by both |ui_thread_| and |file_thread_|. MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // Needed by |model_|. - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; TestingProfile profile_; scoped_ptr<TestBookmarkModelAssociator> model_associator_; diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc index 2f5f48e..5ada9bb 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -29,15 +29,15 @@ #include "chrome/browser/sync/protocol/password_specifics.pb.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/sync/test/engine/test_id_factory.h" +#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/test/notification_observer_mock.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 3132451..8cab39a 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -12,8 +12,8 @@ #include "base/stl_util.h" #include "base/task.h" #include "base/time.h" -#include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/session_service.h" +#include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" #include "chrome/browser/sync/glue/session_change_processor.h" @@ -31,17 +31,17 @@ #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/sync/test/engine/test_id_factory.h" +#include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/profile_mock.h" #include "chrome/test/base/testing_profile.h" -#include "content/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/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -246,7 +246,7 @@ class ProfileSyncServiceSessionTest return true; } - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; // Path used in testing. ScopedTempDir temp_dir_; SessionServiceTestHelper helper_; diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index e376640..6c94eb4 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -19,7 +19,7 @@ #include "chrome/common/net/gaia/gaia_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 "testing/gmock/include/gmock/gmock.h" using browser_sync::DataTypeManager; @@ -79,8 +79,8 @@ class ProfileSyncServiceStartupTest : public testing::Test { } MessageLoop ui_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<TestingProfile> profile_; ProfileSyncFactoryMock factory_; scoped_ptr<TestProfileSyncService> service_; diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 47724f0..e42a1b2e 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -19,7 +19,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 "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/user_agent.h" @@ -112,9 +112,9 @@ class ProfileSyncServiceTest : public testing::Test { MessageLoop ui_loop_; // Needed by |service_|. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // Needed by |service| and |profile_|'s request context. - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<TestProfileSyncService> service_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/sync/profile_sync_test_util.h b/chrome/browser/sync/profile_sync_test_util.h index a1c52eb..024ae05 100644 --- a/chrome/browser/sync/profile_sync_test_util.h +++ b/chrome/browser/sync/profile_sync_test_util.h @@ -13,8 +13,8 @@ #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/profile_sync_service_observer.h" -#include "content/browser/browser_thread.h" #include "content/browser/notification_service_impl.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/sessions/sync_session_context.cc b/chrome/browser/sync/sessions/sync_session_context.cc index f06c300..8448d00 100644 --- a/chrome/browser/sync/sessions/sync_session_context.cc +++ b/chrome/browser/sync/sessions/sync_session_context.cc @@ -4,10 +4,10 @@ #include "chrome/browser/sync/sessions/sync_session_context.h" -#include "chrome/browser/sync/util/extensions_activity_monitor.h" #include "chrome/browser/sync/sessions/debug_info_getter.h" #include "chrome/browser/sync/sessions/session_state.h" -#include "content/browser/browser_thread.h" +#include "chrome/browser/sync/util/extensions_activity_monitor.h" +#include "content/public/browser/browser_thread.h" namespace browser_sync { namespace sessions { diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc index ca0e385..954ec2f 100644 --- a/chrome/browser/sync/sync_global_error_unittest.cc +++ b/chrome/browser/sync/sync_global_error_unittest.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/profile_sync_service_mock.h" -#include "content/browser/browser_thread.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock-actions.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" using ::testing::Return; @@ -71,7 +71,7 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service, // Test that SyncGlobalError shows an error if a passphrase is required. TEST(SyncGlobalErrorTest, PassphraseGlobalError) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); NiceMock<ProfileSyncServiceMock> service; SyncGlobalError error(&service); @@ -88,7 +88,7 @@ TEST(SyncGlobalErrorTest, PassphraseGlobalError) { // the user. TEST(SyncGlobalErrorTest, AuthStateGlobalError) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); NiceMock<ProfileSyncServiceMock> service; SyncGlobalError error(&service); diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index 5e580fc..d527f0f 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -4,11 +4,11 @@ #include "base/basictypes.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/sync/profile_sync_service_mock.h" -#include "content/browser/browser_thread.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "chrome/browser/sync/sync_ui_util.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock-actions.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" using ::testing::Return; @@ -47,7 +47,7 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service, TEST(SyncUIUtilTest, ConstructAboutInformationWithUnrecoverableErrorTest) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); NiceMock<ProfileSyncServiceMock> service; DictionaryValue strings; @@ -77,7 +77,7 @@ TEST(SyncUIUtilTest, ConstructAboutInformationWithUnrecoverableErrorTest) { // passphrase is required. TEST(SyncUIUtilTest, PassphraseGlobalError) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); NiceMock<ProfileSyncServiceMock> service; EXPECT_CALL(service, IsPassphraseRequired()) @@ -93,7 +93,7 @@ TEST(SyncUIUtilTest, PassphraseGlobalError) { // cannot be resolved by the user. TEST(SyncUIUtilTest, AuthStateGlobalError) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); NiceMock<ProfileSyncServiceMock> service; browser_sync::SyncBackendHost::Status status; diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc index 4a10e2e..f1e5715 100644 --- a/chrome/browser/sync/test/integration/passwords_helper.cc +++ b/chrome/browser/sync/test/integration/passwords_helper.cc @@ -8,12 +8,12 @@ #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_data.h" -#include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store.h" +#include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using webkit_glue::PasswordForm; using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc index dec6f48..49e1227 100644 --- a/chrome/browser/sync/test/integration/sessions_helper.cc +++ b/chrome/browser/sync/test/integration/sessions_helper.cc @@ -10,15 +10,15 @@ #include "base/test/test_timeouts.h" #include "base/time.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/sync/glue/session_model_associator.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_harness.h" -#include "chrome/browser/sync/glue/session_model_associator.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index e0693a8..c2c6247 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" @@ -33,10 +33,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_browser_process.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/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 5a13555..3823a27 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -21,7 +21,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // This is a simple utility that initializes a sync notifier and // listens to any received notifications. @@ -93,9 +93,9 @@ int main(int argc, char* argv[]) { logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); MessageLoop ui_loop; - BrowserThread ui_thread(BrowserThread::UI, &ui_loop); + DeprecatedBrowserThread ui_thread(BrowserThread::UI, &ui_loop); - BrowserThread io_thread(BrowserThread::IO); + DeprecatedBrowserThread io_thread(BrowserThread::IO); base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_IO; io_thread.StartWithOptions(options); diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc index 891ecea..d59ceaa 100644 --- a/chrome/browser/sync/util/extensions_activity_monitor.cc +++ b/chrome/browser/sync/util/extensions_activity_monitor.cc @@ -8,7 +8,7 @@ #include "chrome/browser/bookmarks/bookmark_extension_api.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" namespace browser_sync { diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc index c7c3970..9644ab8 100644 --- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/notification_service_impl.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using browser_sync::ExtensionsActivityMonitor; @@ -140,7 +140,7 @@ class ExtensionsActivityMonitorTest : public testing::Test { } private: content::NotificationService* service_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(ExtensionsActivityMonitorTest, Basic) { |