diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:44:49 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:44:49 +0000 |
| commit | c38831a108f9f905ce9e68503ee67274939cc950 (patch) | |
| tree | 7c93c8afd386fdc11a0f03855cee62c2d3449d63 | |
| parent | 75c753a51b150912055d7a8305cf77134d24816a (diff) | |
| download | chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.zip chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.tar.gz chromium_src-c38831a108f9f905ce9e68503ee67274939cc950.tar.bz2 | |
Split BrowserThread into public API and private implementation, step 1.
Only content/ now has the ability to create BrowserThread objects,
with the exception that tests can create the
content::TestBrowserThread subclass, and (temporarily) code in chrome/
can create the DeprecatedBrowserThread subclass.
A follow-up change will make content/ take care of its own thread
creation, remove DeprecatedBrowserThread, and move all state and
non-trivial constructors from BrowserThread down to BrowserThreadImpl.
Also moved BrowserProcessSubThread into content/ namespace. As part
of follow-up cleanup, chrome/ will stop using this class.
BUG=98716
TEST=existing
Review URL: http://codereview.chromium.org/8392042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107718 0039d316-1c4b-4281-b951-d872f2087c98
738 files changed, 1802 insertions, 1567 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index cf27ed3..3cd12f2 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -25,12 +25,12 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/browser_thread.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 0a2a2e5..8bce151 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -59,10 +59,10 @@ #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc index f839bab..dafb3ef 100644 --- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/history/history.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -101,8 +101,8 @@ class HistoryContentsProviderTest : public testing::Test, } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<HistoryContentsProvider> provider_; diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index df3ac82..c1fd137 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -22,7 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -112,8 +112,8 @@ class HistoryQuickProviderTest : public testing::Test, std::string expected_top_result); MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; HistoryService* history_service_; diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 1eab02c..b981f3a 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -153,8 +153,8 @@ class HistoryURLProviderTest : public testing::Test, void RunAdjustOffsetTest(const string16 text, size_t expected_offset); MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; ACMatches matches_; scoped_ptr<TestingProfile> profile_; HistoryService* history_service_; diff --git a/chrome/browser/autocomplete/network_action_predictor_unittest.cc b/chrome/browser/autocomplete/network_action_predictor_unittest.cc index fbca1a2..53bec27 100644 --- a/chrome/browser/autocomplete/network_action_predictor_unittest.cc +++ b/chrome/browser/autocomplete/network_action_predictor_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/url_database.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -101,8 +101,8 @@ class NetworkActionPredictorTest : public testing::Test { private: MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; TestingProfile profile_; NetworkActionPredictor predictor_; }; diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 340f693..082a062 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.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 "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" @@ -89,7 +89,7 @@ class SearchProviderTest : public testing::Test, GURL keyword_url_; MessageLoopForUI message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; // URLFetcherFactory implementation registered. TestURLFetcherFactory test_factory_; diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index 178671c..bd7e544 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -23,7 +23,7 @@ #include "chrome/browser/prefs/pref_service.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/gtest/include/gtest/gtest.h" using base::Time; @@ -151,8 +151,8 @@ class ShortcutsProviderTest : public testing::Test, std::string expected_top_result); MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc index 540e5f0..0267142 100644 --- a/chrome/browser/autocomplete_history_manager_unittest.cc +++ b/chrome/browser/autocomplete_history_manager_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_data.h" @@ -40,7 +41,7 @@ class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness { contents(), &profile_, web_data_service_)); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfile profile_; scoped_refptr<MockWebDataService> web_data_service_; diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc index fa4069b..2cd3d4d 100644 --- a/chrome/browser/autofill/address_unittest.cc +++ b/chrome/browser/autofill/address_unittest.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/address.h" #include "chrome/browser/autofill/autofill_type.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class AddressTest : public testing::Test { @@ -20,7 +20,7 @@ class AddressTest : public testing::Test { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(AddressTest); }; diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index 951e8bf..a7ffd7b 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -4,9 +4,9 @@ #include "chrome/browser/autofill/autofill_country.h" +#include <map> #include <stddef.h> #include <stdint.h> -#include <map> #include <utility> #include "base/logging.h" @@ -16,7 +16,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "unicode/coll.h" diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc index ad76e1f..55c59e6 100644 --- a/chrome/browser/autofill/autofill_download_unittest.cc +++ b/chrome/browser/autofill/autofill_download_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/test/base/test_url_request_context_getter.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" @@ -135,7 +136,7 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer, private: // |request_context_getter_| must be released on the IO thread. MessageLoop* io_thread_loop() { return io_thread_.message_loop(); } - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(AutofillDownloadTest, QueryAndUploadTest) { diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index 416b36b..e9d1720 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -27,8 +27,8 @@ #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" @@ -566,7 +566,7 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness { } protected: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; scoped_ptr<TestAutofillManager> autofill_manager_; TestPersonalDataManager personal_data_; diff --git a/chrome/browser/autofill/autofill_metrics_unittest.cc b/chrome/browser/autofill/autofill_metrics_unittest.cc index 1d5fe4d..26b7af0 100644 --- a/chrome/browser/autofill/autofill_metrics_unittest.cc +++ b/chrome/browser/autofill/autofill_metrics_unittest.cc @@ -14,12 +14,12 @@ #include "chrome/browser/autofill/autofill_metrics.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" -#include "chrome/browser/webdata/web_data_service.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/testing_profile.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_data.h" @@ -233,7 +233,7 @@ class AutofillMetricsTest : public TabContentsWrapperTestHarness { TestPersonalDataManager personal_data_; private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; DISALLOW_COPY_AND_ASSIGN(AutofillMetricsTest); }; diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc index aae657b..6d6d273 100644 --- a/chrome/browser/autofill/personal_data_manager.cc +++ b/chrome/browser/autofill/personal_data_manager.cc @@ -25,7 +25,7 @@ #include "chrome/browser/webdata/web_data_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_source.h" namespace { diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc index ad69c16..f3a1f21 100644 --- a/chrome/browser/autofill/personal_data_manager_unittest.cc +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc @@ -17,12 +17,12 @@ #include "chrome/common/guid.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.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_source.h" #include "content/public/browser/notification_types.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" #include "webkit/glue/form_data.h" @@ -81,8 +81,8 @@ class PersonalDataManagerTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<PersonalDataManager> personal_data_; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/autofill/phone_number_i18n_unittest.cc b/chrome/browser/autofill/phone_number_i18n_unittest.cc index b133b55..d8c4611 100644 --- a/chrome/browser/autofill/phone_number_i18n_unittest.cc +++ b/chrome/browser/autofill/phone_number_i18n_unittest.cc @@ -5,7 +5,7 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/phone_number_i18n.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using autofill_i18n::NormalizePhoneNumber; @@ -21,7 +21,7 @@ class PhoneNumberI18NTest : public testing::Test { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(PhoneNumberI18NTest); }; diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index ad54bc7..db8f052 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -77,7 +77,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/download/download_item.h" #include "content/browser/download/save_package.h" @@ -88,6 +87,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 1dc9e40..c082065 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -26,10 +26,10 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/common/automation_constants.h" #include "chrome/common/content_settings.h" -#include "content/browser/browser_thread.h" #include "content/browser/cancelable_request.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/trace_controller.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "ipc/ipc_channel.h" diff --git a/chrome/browser/automation/automation_provider_unittest.cc b/chrome/browser/automation/automation_provider_unittest.cc index f78b9a6..d4dd565 100644 --- a/chrome/browser/automation/automation_provider_unittest.cc +++ b/chrome/browser/automation/automation_provider_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2009 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. #include "chrome/browser/automation/chrome_frame_automation_provider.h" #include "chrome/test/base/testing_browser_process.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" @@ -24,7 +24,7 @@ typedef testing::Test AutomationProviderTest; TEST_F(AutomationProviderTest, TestInvalidChromeFrameMessage) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); IPC::Message bad_msg(1, -1, IPC::Message::PRIORITY_NORMAL); diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index 9206d24..ec98e61d 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/chrome/browser/automation/automation_resource_message_filter.cc @@ -5,8 +5,8 @@ #include "chrome/browser/automation/automation_resource_message_filter.h" #include "base/bind.h" -#include "base/path_service.h" #include "base/metrics/histogram.h" +#include "base/path_service.h" #include "base/stl_util.h" #include "chrome/browser/automation/url_request_automation_job.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" @@ -15,7 +15,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/render_messages.h" #include "content/browser/browser_message_filter.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/automation/automation_tab_helper_unittest.cc b/chrome/browser/automation/automation_tab_helper_unittest.cc index f3f2064..d858a2c 100644 --- a/chrome/browser/automation/automation_tab_helper_unittest.cc +++ b/chrome/browser/automation/automation_tab_helper_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/automation/mock_tab_event_observer.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -55,7 +55,7 @@ class AutomationTabHelperTest : public TabContentsWrapperTestHarness { return contents_wrapper()->automation_tab_helper(); } - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; MockTabEventObserver mock_observer_; }; diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 8c91ce0..00b2a27 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/automation/ui_controls_mac.mm b/chrome/browser/automation/ui_controls_mac.mm index 4dd9918..f3f8b83 100644 --- a/chrome/browser/automation/ui_controls_mac.mm +++ b/chrome/browser/automation/ui_controls_mac.mm @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/message_loop.h" #include "chrome/browser/automation/ui_controls_internal.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/keycodes/keyboard_code_conversion_mac.h" // Implementation details: We use [NSApplication sendEvent:] instead diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index 1af990d..365da8d 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -10,10 +10,10 @@ #include "base/time.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/common/automation_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.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 "net/base/cookie_monster.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 320052b..f3fff07 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -19,9 +19,9 @@ #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/common/extensions/extension.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_types.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" // This value is used to seed the PRNG at the beginning of a sequence of diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc index b4495c5..2c81206 100644 --- a/chrome/browser/background/background_mode_manager_gtk.cc +++ b/chrome/browser/background/background_mode_manager_gtk.cc @@ -17,7 +17,7 @@ #include "chrome/common/auto_start_linux.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/background/background_mode_manager_mac.mm b/chrome/browser/background/background_mode_manager_mac.mm index 5cad595..2635894 100644 --- a/chrome/browser/background/background_mode_manager_mac.mm +++ b/chrome/browser/background/background_mode_manager_mac.mm @@ -9,7 +9,7 @@ #include "chrome/browser/prefs/pref_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" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index ce30a32..ed2baa8 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc @@ -12,7 +12,7 @@ #include "base/win/registry.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 0189634..80015be 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/page_navigator.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" @@ -76,8 +76,8 @@ class BookmarkContextMenuControllerTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; BookmarkModel* model_; TestingPageNavigator navigator_; diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc index 515fc3f..1ec3ef6 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class BookmarkExpandedStateTrackerTest : public testing::Test { @@ -23,8 +23,8 @@ class BookmarkExpandedStateTrackerTest : public testing::Test { private: scoped_ptr<TestingProfile> profile_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTrackerTest); }; diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index cd50649..c95565f4 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -20,7 +20,7 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.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" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index f04a4de..ab28ae9 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" @@ -135,8 +135,9 @@ class BookmarksObserver : public BookmarksExportObserver { // way of bookmark_html_writer, then using the importer to read it back in. TEST_F(BookmarkHTMLWriterTest, Test) { MessageLoop message_loop; - BrowserThread fake_ui_thread(BrowserThread::UI, &message_loop); - BrowserThread fake_file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread fake_ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread fake_file_thread(BrowserThread::FILE, + &message_loop); TestingProfile profile; profile.CreateHistoryService(true, false); diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index 1e7f3c9..87118f5 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/in_memory_database.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 BookmarkIndexTest : public testing::Test { @@ -221,8 +221,8 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) { // This ensures MessageLoop::current() will exist, which is needed by // TestingProfile::BlockUntilHistoryProcessesPendingRequests(). MessageLoop loop(MessageLoop::TYPE_DEFAULT); - 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); TestingProfile profile; profile.CreateHistoryService(true, false); diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index ffa8bdb..6a89f6c 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -5,10 +5,10 @@ #include <set> #include <string> -#include "base/basictypes.h" -#include "base/compiler_specific.h" #include "base/base_paths.h" +#include "base/basictypes.h" #include "base/command_line.h" +#include "base/compiler_specific.h" #include "base/file_util.h" #include "base/hash_tables.h" #include "base/path_service.h" @@ -27,10 +27,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/model_test_utils.h" #include "chrome/test/base/testing_profile.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_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/tree_node_iterator.h" #include "ui/base/models/tree_node_model.h" @@ -754,8 +754,8 @@ class BookmarkModelTestWithProfile : public testing::Test { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; // Creates a set of nodes in the bookmark bar model, then recreates the diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc index b9c58bb..9ec687a 100644 --- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/test/base/testing_profile.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" #include "ui/base/dragdrop/os_exchange_data.h" @@ -23,8 +23,8 @@ class BookmarkNodeDataTest : public testing::Test { private: MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; namespace { diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 0c8ea83..b203910 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.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" using base::TimeTicks; diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc index d539d8a..ebbb213f 100644 --- a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.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 RecentlyUsedFoldersComboModelTest : public testing::Test { @@ -22,8 +22,8 @@ class RecentlyUsedFoldersComboModelTest : public testing::Test { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModelTest); }; diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index d9e192e..df57028 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -46,13 +46,13 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/sensors/sensors_provider.h" #include "content/common/gpu/gpu_messages.h" +#include "content/public/browser/browser_thread.h" #include "crypto/nss_util.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc index b1c245d..3fc83ff 100644 --- a/chrome/browser/browser_about_handler_unittest.cc +++ b/chrome/browser/browser_about_handler_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/common/about_handler.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -103,7 +103,7 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) { } }; MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); TestingProfile profile; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 4868721..7cf1872 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -8,10 +8,10 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/test/test_browser_thread.h" typedef BrowserWithTestWindowTest BrowserCommandsTest; diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 17926f7..c778e9d 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -17,8 +17,8 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/background/background_mode_manager.h" -#include "chrome/browser/chrome_browser_main.h" #include "chrome/browser/browser_trial.h" +#include "chrome/browser/chrome_browser_main.h" #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/browser/component_updater/component_updater_configurator.h" #include "chrome/browser/component_updater/component_updater_service.h" @@ -71,7 +71,6 @@ #include "chrome/installer/util/google_update_constants.h" #include "content/browser/browser_child_process_host.h" #include "content/browser/browser_process_sub_thread.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/download/download_file_manager.h" @@ -83,6 +82,7 @@ #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/common/url_fetcher.h" #include "ipc/ipc_logging.h" @@ -836,7 +836,7 @@ void BrowserProcessImpl::CreateFileThread() { created_file_thread_ = true; scoped_ptr<base::Thread> thread( - new BrowserProcessSubThread(BrowserThread::FILE)); + new content::BrowserProcessSubThread(BrowserThread::FILE)); base::Thread::Options options; #if defined(OS_WIN) // On Windows, the FILE thread needs to be have a UI message loop which pumps @@ -857,7 +857,7 @@ void BrowserProcessImpl::CreateWebSocketProxyThread() { created_web_socket_proxy_thread_ = true; scoped_ptr<base::Thread> thread( - new BrowserProcessSubThread(BrowserThread::WEB_SOCKET_PROXY)); + new content::BrowserProcessSubThread(BrowserThread::WEB_SOCKET_PROXY)); base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_IO; if (!thread->StartWithOptions(options)) @@ -871,7 +871,7 @@ void BrowserProcessImpl::CreateDBThread() { created_db_thread_ = true; scoped_ptr<base::Thread> thread( - new BrowserProcessSubThread(BrowserThread::DB)); + new content::BrowserProcessSubThread(BrowserThread::DB)); if (!thread->Start()) return; db_thread_.swap(thread); @@ -882,7 +882,7 @@ void BrowserProcessImpl::CreateProcessLauncherThread() { created_process_launcher_thread_ = true; scoped_ptr<base::Thread> thread( - new BrowserProcessSubThread(BrowserThread::PROCESS_LAUNCHER)); + new content::BrowserProcessSubThread(BrowserThread::PROCESS_LAUNCHER)); if (!thread->Start()) return; process_launcher_thread_.swap(thread); @@ -893,7 +893,7 @@ void BrowserProcessImpl::CreateCacheThread() { created_cache_thread_ = true; scoped_ptr<base::Thread> thread( - new BrowserThread(BrowserThread::CACHE)); + new DeprecatedBrowserThread(BrowserThread::CACHE)); base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_IO; if (!thread->StartWithOptions(options)) diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 0a7ff28..c0610b9 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -13,8 +13,8 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" @@ -33,11 +33,11 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/switch_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc index b344b1c..f88e21e 100644 --- a/chrome/browser/browsing_data_appcache_helper.cc +++ b/chrome/browser/browsing_data_appcache_helper.cc @@ -8,7 +8,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/appcache/appcache_database.h" #include "webkit/appcache/appcache_storage.h" diff --git a/chrome/browser/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data_cookie_helper.cc index 589d2057..3352fb3 100644 --- a/chrome/browser/browsing_data_cookie_helper.cc +++ b/chrome/browser/browsing_data_cookie_helper.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data_cookie_helper_unittest.cc index dda9b7e..81ab3ff 100644 --- a/chrome/browser/browsing_data_cookie_helper_unittest.cc +++ b/chrome/browser/browsing_data_cookie_helper_unittest.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,10 +30,11 @@ class BrowsingDataCookieHelperTest : public testing::Test { } virtual void SetUp() { - ui_thread_.reset(new BrowserThread(BrowserThread::UI, &message_loop_)); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + &message_loop_)); // Note: we're starting a real IO thread because parts of the // BrowsingDataCookieHelper expect to run on that thread. - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); ASSERT_TRUE(io_thread_->Start()); testing_profile_.reset(new TestingProfile()); base::WaitableEvent io_setup_complete(true, false); @@ -110,8 +111,8 @@ class BrowsingDataCookieHelperTest : public testing::Test { protected: MessageLoop message_loop_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<TestingProfile> testing_profile_; net::CookieList cookie_list_; diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc index 28419ab..a960457 100644 --- a/chrome/browser/browsing_data_database_helper.cc +++ b/chrome/browser/browsing_data_database_helper.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc index cee5afa..c85f1554 100644 --- a/chrome/browser/browsing_data_database_helper_browsertest.cc +++ b/chrome/browser/browsing_data_database_helper_browsertest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" namespace { typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo> diff --git a/chrome/browser/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data_file_system_helper.cc index ae7c039..8a523ef 100644 --- a/chrome/browser/browsing_data_file_system_helper.cc +++ b/chrome/browser/browsing_data_file_system_helper.cc @@ -12,9 +12,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" -#include "webkit/fileapi/file_system_quota_util.h" +#include "content/public/browser/browser_thread.h" #include "webkit/fileapi/file_system_context.h" +#include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" diff --git a/chrome/browser/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data_file_system_helper_unittest.cc index 30c3be6..d8caf51 100644 --- a/chrome/browser/browsing_data_file_system_helper_unittest.cc +++ b/chrome/browser/browsing_data_file_system_helper_unittest.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browsing_data_file_system_helper.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_path_manager.h" #include "webkit/fileapi/file_system_types.h" @@ -173,9 +173,9 @@ class BrowsingDataFileSystemHelperTest : public testing::Test { // defined before profile_ to prevent explosions. The threads also must be // defined in the order they're listed here. Oh how I love C++. MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; TestingProfile profile_; // We don't own this pointer: don't delete it. diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc index e183415..ef68e99 100644 --- a/chrome/browser/browsing_data_indexed_db_helper.cc +++ b/chrome/browser/browsing_data_indexed_db_helper.cc @@ -13,8 +13,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/public/browser/browser_thread.h" #include "webkit/database/database_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc index 8b84fc2..e338839 100644 --- a/chrome/browser/browsing_data_local_storage_helper.cc +++ b/chrome/browser/browsing_data_local_storage_helper.cc @@ -10,8 +10,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/public/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" diff --git a/chrome/browser/browsing_data_quota_helper.h b/chrome/browser/browsing_data_quota_helper.h index 2e41e00..52bf17a 100644 --- a/chrome/browser/browsing_data_quota_helper.h +++ b/chrome/browser/browsing_data_quota_helper.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "base/time.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_types.h" class Profile; diff --git a/chrome/browser/browsing_data_quota_helper_impl.h b/chrome/browser/browsing_data_quota_helper_impl.h index 7d8523a..81e2fe7 100644 --- a/chrome/browser/browsing_data_quota_helper_impl.h +++ b/chrome/browser/browsing_data_quota_helper_impl.h @@ -17,7 +17,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "chrome/browser/browsing_data_quota_helper.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_types.h" namespace quota { diff --git a/chrome/browser/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data_quota_helper_unittest.cc index 12ee98a..94b54f4 100644 --- a/chrome/browser/browsing_data_quota_helper_unittest.cc +++ b/chrome/browser/browsing_data_quota_helper_unittest.cc @@ -9,6 +9,7 @@ #include "base/message_loop_proxy.h" #include "base/scoped_temp_dir.h" #include "chrome/browser/browsing_data_quota_helper_impl.h" +#include "content/test/test_browser_thread.h" #include "webkit/quota/mock_storage_client.h" #include "webkit/quota/quota_manager.h" @@ -112,9 +113,9 @@ class BrowsingDataQuotaHelperTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<quota::QuotaManager> quota_manager_; ScopedTempDir dir_; diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 8affaa0..7199d6e 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -42,10 +42,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_manager.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "net/base/cookie_monster.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc index d499ba3..1d4dfc9 100644 --- a/chrome/browser/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data_remover_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -289,11 +290,11 @@ class BrowsingDataRemoverTest : public testing::Test { // message_loop_, as well as all the threads associated with it must be // defined before profile_ to prevent explosions. Oh how I love C++. MessageLoopForUI message_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_; scoped_ptr<TestingProfile> profile_; DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverTest); diff --git a/chrome/browser/bug_report_data.cc b/chrome/browser/bug_report_data.cc index 2311b04..c320512 100644 --- a/chrome/browser/bug_report_data.cc +++ b/chrome/browser/bug_report_data.cc @@ -5,7 +5,7 @@ #include "chrome/browser/bug_report_data.h" #include "chrome/browser/bug_report_util.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/notifications/system_notification.h" diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 1c643fe..8fd55d6 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 057df5d0..36e5f0f 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -89,10 +89,10 @@ #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" #include "chrome/installer/util/google_update_settings.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/common/child_process.h" #include "content/common/main_function_params.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_client.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" @@ -126,9 +126,9 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/audio_handler.h" #include "chrome/browser/chromeos/boot_times_loader.h" -#include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/screen_lock_library.h" +#include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/customization_document.h" #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" #include "chrome/browser/chromeos/external_metrics.h" diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc index a733606..2a9fe0e 100644 --- a/chrome/browser/chrome_browser_main_posix.cc +++ b/chrome/browser/chrome_browser_main_posix.cc @@ -19,7 +19,7 @@ #include "base/string_number_conversions.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS) #include "chrome/browser/printing/print_dialog_gtk.h" diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc index ddc2f15..7e37763 100644 --- a/chrome/browser/chrome_browser_main_x11.cc +++ b/chrome/browser/chrome_browser_main_x11.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/debug/debugger.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/metrics/metrics_service.h" -#include "content/browser/browser_thread.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_result_codes.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/x/x11_util.h" #include "ui/base/x/x11_util_internal.h" diff --git a/chrome/browser/chrome_plugin_message_filter.cc b/chrome/browser/chrome_plugin_message_filter.cc index a3250b3..56e0cfc 100644 --- a/chrome/browser/chrome_plugin_message_filter.cc +++ b/chrome/browser/chrome_plugin_message_filter.cc @@ -13,11 +13,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_plugin_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context_getter.h" #include "webkit/plugins/npapi/default_plugin_shared.h" diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/chrome_plugin_service_filter.cc index 278f691..99da949 100644 --- a/chrome/browser/chrome_plugin_service_filter.cc +++ b/chrome/browser/chrome_plugin_service_filter.cc @@ -9,10 +9,10 @@ #include "chrome/browser/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/resource_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 8154123..5e4ca68 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -16,8 +16,8 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_details.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/chromeos/audio_handler.cc b/chrome/browser/chromeos/audio_handler.cc index 0f6f5c4..ffb57fe 100644 --- a/chrome/browser/chromeos/audio_handler.cc +++ b/chrome/browser/chromeos/audio_handler.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "chrome/browser/chromeos/audio_mixer_alsa.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using std::max; using std::min; diff --git a/chrome/browser/chromeos/audio_mixer_alsa.cc b/chrome/browser/chromeos/audio_mixer_alsa.cc index 7898d16..2db18fa 100644 --- a/chrome/browser/chromeos/audio_mixer_alsa.cc +++ b/chrome/browser/chromeos/audio_mixer_alsa.cc @@ -19,7 +19,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" typedef long alsa_long_t; // 'long' is required for ALSA API calls. diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index 8cc85d4..62ac68f 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -23,14 +23,14 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/authentication_notification_details.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" namespace { diff --git a/chrome/browser/chromeos/cros/burn_library.cc b/chrome/browser/chromeos/cros/burn_library.cc index cd5bf3f..bc07a95 100644 --- a/chrome/browser/chromeos/cros/burn_library.cc +++ b/chrome/browser/chromeos/cros/burn_library.cc @@ -5,11 +5,12 @@ #include "chrome/browser/chromeos/cros/burn_library.h" #include <cstring> + #include "base/bind.h" #include "base/memory/linked_ptr.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/zip.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 387ad10..4709fe1 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -11,7 +11,7 @@ #include "chrome/browser/browser_process.h" // g_browser_process #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/net/x509_certificate_model.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "crypto/nss_util.h" #include "grit/generated_resources.h" #include "net/base/cert_database.h" diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc index 718fc1a..955a2e8 100644 --- a/chrome/browser/chromeos/cros/cryptohome_library.cc +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { const char kStubSystemSalt[] = "stub_system_salt"; diff --git a/chrome/browser/chromeos/cros/mock_mount_library.cc b/chrome/browser/chromeos/cros/mock_mount_library.cc index 6ecdb90..c7ac747 100644 --- a/chrome/browser/chromeos/cros/mock_mount_library.cc +++ b/chrome/browser/chromeos/cros/mock_mount_library.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc index 1910eae..ee9c170 100644 --- a/chrome/browser/chromeos/cros/mount_library.cc +++ b/chrome/browser/chromeos/cros/mount_library.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" const char* kLibraryNotLoaded = "Cros Library not loaded"; const char* kDeviceNotFound = "Device could not be found"; diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 1f3ca46..d44e050 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -24,8 +24,8 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" #include "base/utf_string_conversion_utils.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/native_network_constants.h" @@ -35,7 +35,7 @@ #include "chrome/browser/chromeos/network_login_observer.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/common/time_format.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc index cb675c9..01aeb4b 100644 --- a/chrome/browser/chromeos/cros/power_library.cc +++ b/chrome/browser/chromeos/cros/power_library.cc @@ -14,7 +14,7 @@ #include "base/time.h" #include "base/timer.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/cros/chromeos_power.h" #include "third_party/cros/chromeos_resume.h" diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc index b31b2cc..96853cb 100644 --- a/chrome/browser/chromeos/cros/screen_lock_library.cc +++ b/chrome/browser/chromeos/cros/screen_lock_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/cros/chromeos_screen_lock.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc index adc291d..bc4ec4c 100644 --- a/chrome/browser/chromeos/cros/update_library.cc +++ b/chrome/browser/chromeos/cros/update_library.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index dafc83c..2173f11 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -21,7 +21,7 @@ #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" // Manifest attributes names. diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc index 364eb95..bb1bdcb 100644 --- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc @@ -8,7 +8,7 @@ #include "base/threading/platform_thread.h" #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h" #include "chrome/browser/chromeos/system/runtime_environment.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/exported_object.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/chromeos/enterprise_extension_observer.cc b/chrome/browser/chromeos/enterprise_extension_observer.cc index a16dbf6..c380ca6 100644 --- a/chrome/browser/chromeos/enterprise_extension_observer.cc +++ b/chrome/browser/chromeos/enterprise_extension_observer.cc @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/dbus/session_manager_client.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc index d4c15cb..1a5ed13 100644 --- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc +++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc @@ -12,7 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc index 43d5994..34adc13 100644 --- a/chrome/browser/chromeos/external_metrics.cc +++ b/chrome/browser/chromeos/external_metrics.cc @@ -8,10 +8,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/types.h> +#include <unistd.h> #include "base/basictypes.h" #include "base/eintr_wrapper.h" @@ -21,7 +21,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" #include "content/browser/user_metrics.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index a3224e0..5484eb5 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -16,6 +16,7 @@ #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/dummy_resource_handler.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/test/test_browser_thread.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" @@ -180,9 +181,9 @@ class GViewRequestInterceptorTest : public testing::Test { protected: MessageLoopForIO message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; TestingPrefService prefs_; scoped_refptr<PluginPrefs> plugin_prefs_; net::URLRequestJobFactory job_factory_; diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc index 58effbe..36344d5 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager.cc @@ -23,7 +23,7 @@ #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" #include "chrome/browser/chromeos/language_preferences.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 "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc index 61c8338..ac9297e 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard.cc @@ -22,7 +22,7 @@ #include "base/stringprintf.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/system/runtime_environment.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/x/x11_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc index 02068dc..21f146d 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/x/x11_util.h" @@ -59,7 +59,7 @@ class XKeyboardTest : public testing::Test { TestableXKeyboard xkey_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; // Returns a ModifierMap object that contains the following mapping: diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc index a67b802..bde23f3 100644 --- a/chrome/browser/chromeos/login/auth_attempt_state.cc +++ b/chrome/browser/chromeos/login/auth_attempt_state.cc @@ -8,7 +8,7 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/cros/chromeos_cryptohome.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/camera.cc b/chrome/browser/chromeos/login/camera.cc index 6c2bf45..9c5af6b 100644 --- a/chrome/browser/chromeos/login/camera.cc +++ b/chrome/browser/chromeos/login/camera.cc @@ -1,20 +1,20 @@ -// 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. #include "chrome/browser/chromeos/login/camera.h" -#include <stdlib.h> -#include <fcntl.h> // low-level i/o -#include <unistd.h> +#include <asm/types.h> // for videodev2.h #include <errno.h> +#include <fcntl.h> // low-level i/o +#include <linux/videodev2.h> +#include <stdlib.h> +#include <sys/ioctl.h> +#include <sys/mman.h> #include <sys/stat.h> -#include <sys/types.h> #include <sys/time.h> -#include <sys/mman.h> -#include <sys/ioctl.h> -#include <asm/types.h> // for videodev2.h -#include <linux/videodev2.h> +#include <sys/types.h> +#include <unistd.h> #include <algorithm> #include <vector> @@ -26,7 +26,7 @@ #include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/time.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorPriv.h" diff --git a/chrome/browser/chromeos/login/camera_detector.cc b/chrome/browser/chromeos/login/camera_detector.cc index 33ce547..6d3932f 100644 --- a/chrome/browser/chromeos/login/camera_detector.cc +++ b/chrome/browser/chromeos/login/camera_detector.cc @@ -9,7 +9,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "chrome/browser/chromeos/system/udev_info_provider.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc index 75b0cf6..f386fa8 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc +++ b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/login/mock_auth_response_handler.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" @@ -40,7 +40,7 @@ class CookieFetcherTest : public testing::Test { const std::string client_login_data_; const std::string token_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfile profile_; }; diff --git a/chrome/browser/chromeos/login/cryptohome_op.cc b/chrome/browser/chromeos/login/cryptohome_op.cc index 00ac12c..86457d4 100644 --- a/chrome/browser/chromeos/login/cryptohome_op.cc +++ b/chrome/browser/chromeos/login/cryptohome_op.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/login/auth_attempt_state.h" #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/cryptohome_op_unittest.cc b/chrome/browser/chromeos/login/cryptohome_op_unittest.cc index 664e3d9..973d5bb 100644 --- a/chrome/browser/chromeos/login/cryptohome_op_unittest.cc +++ b/chrome/browser/chromeos/login/cryptohome_op_unittest.cc @@ -8,12 +8,12 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "chrome/browser/chromeos/cros/mock_library_loader.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" +#include "chrome/browser/chromeos/cros/mock_library_loader.h" #include "chrome/browser/chromeos/login/auth_attempt_state.h" #include "chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h" #include "chrome/browser/chromeos/login/test_attempt_state.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" @@ -125,8 +125,8 @@ class CryptohomeOpTest : public ::testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; std::string username_; std::string hash_ascii_; TestAttemptState state_; diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc index 794e45a..0b5af57 100644 --- a/chrome/browser/chromeos/login/google_authenticator.cc +++ b/chrome/browser/chromeos/login/google_authenticator.cc @@ -14,7 +14,6 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/synchronization/lock.h" -#include "crypto/sha2.h" #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/login/auth_response_handler.h" @@ -28,8 +27,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.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 "crypto/sha2.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc index 19d1d3f..342a40b 100644 --- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc @@ -28,7 +28,7 @@ #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" @@ -121,7 +121,7 @@ class GoogleAuthenticatorTest : public testing::Test { void ReadLocalaccountFile(GoogleAuthenticator* auth, const std::string& filename) { - BrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread file_thread(BrowserThread::FILE); file_thread.Start(); BrowserThread::PostTask( @@ -152,7 +152,7 @@ class GoogleAuthenticatorTest : public testing::Test { } MessageLoop message_loop_ui_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; unsigned char fake_hash_[32]; std::string hash_ascii_; @@ -611,7 +611,7 @@ TEST_F(GoogleAuthenticatorTest, FullHostedLoginFailure) { &profile, username_, hash_ascii_, std::string(), std::string()); // For when |auth| tries to load the localaccount file. - BrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread file_thread(BrowserThread::FILE); file_thread.Start(); // Run the UI thread until we exit it gracefully. @@ -649,7 +649,7 @@ TEST_F(GoogleAuthenticatorTest, CancelLogin) { scoped_refptr<GoogleAuthenticator> auth(new GoogleAuthenticator(&consumer)); // For when |auth| tries to load the localaccount file. - BrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread file_thread(BrowserThread::FILE); file_thread.Start(); // Start an authentication attempt, which will kick off a URL "fetch" that diff --git a/chrome/browser/chromeos/login/image_decoder.cc b/chrome/browser/chromeos/login/image_decoder.cc index 1c17940..3695921 100644 --- a/chrome/browser/chromeos/login/image_decoder.cc +++ b/chrome/browser/chromeos/login/image_decoder.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_utility_messages.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc index 49d4ed6..c8f98ea 100644 --- a/chrome/browser/chromeos/login/image_downloader.cc +++ b/chrome/browser/chromeos/login/image_downloader.cc @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/profiles/profile_manager.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index b430c10..6a1671c 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -26,15 +26,15 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.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 "content/public/browser/notification_types.h" +#include "grit/generated_resources.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index c2a250d..0b4a2ad 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -60,7 +60,7 @@ #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" diff --git a/chrome/browser/chromeos/login/mock_authenticator.cc b/chrome/browser/chromeos/login/mock_authenticator.cc index eac9584..38251a1 100644 --- a/chrome/browser/chromeos/login/mock_authenticator.cc +++ b/chrome/browser/chromeos/login/mock_authenticator.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/login/mock_authenticator.h" #include "base/bind.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/mock_authenticator.h b/chrome/browser/chromeos/login/mock_authenticator.h index c049751..d0f2594 100644 --- a/chrome/browser/chromeos/login/mock_authenticator.h +++ b/chrome/browser/chromeos/login/mock_authenticator.h @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/login/background_view.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/common/net/gaia/google_service_auth_error.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class Profile; diff --git a/chrome/browser/chromeos/login/mock_owner_key_utils.h b/chrome/browser/chromeos/login/mock_owner_key_utils.h index 487a9bd..d025324 100644 --- a/chrome/browser/chromeos/login/mock_owner_key_utils.h +++ b/chrome/browser/chromeos/login/mock_owner_key_utils.h @@ -12,7 +12,6 @@ #include "base/file_path.h" #include "crypto/rsa_private_key.h" #include "chrome/browser/chromeos/login/owner_key_utils.h" -#include "content/browser/browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index 14b9445..5636a44 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -10,7 +10,8 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "chrome/common/net/http_return.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/online_attempt.cc b/chrome/browser/chromeos/login/online_attempt.cc index c5015f3..4f34530 100644 --- a/chrome/browser/chromeos/login/online_attempt.cc +++ b/chrome/browser/chromeos/login/online_attempt.cc @@ -17,7 +17,7 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc index e4343fd..41155f3 100644 --- a/chrome/browser/chromeos/login/online_attempt_unittest.cc +++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h" #include "chrome/test/base/testing_profile.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" @@ -95,8 +95,8 @@ class OnlineAttemptTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; TestAttemptState state_; scoped_ptr<MockAuthAttemptStateResolver> resolver_; scoped_refptr<OnlineAttempt> attempt_; diff --git a/chrome/browser/chromeos/login/owner_manager.cc b/chrome/browser/chromeos/login/owner_manager.cc index 1aef034..b8c4cf0 100644 --- a/chrome/browser/chromeos/login/owner_manager.cc +++ b/chrome/browser/chromeos/login/owner_manager.cc @@ -13,8 +13,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/login/signed_settings_temp_storage.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" namespace chromeos { diff --git a/chrome/browser/chromeos/login/owner_manager.h b/chrome/browser/chromeos/login/owner_manager.h index 639bfa2..f8eb957 100644 --- a/chrome/browser/chromeos/login/owner_manager.h +++ b/chrome/browser/chromeos/login/owner_manager.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "crypto/rsa_private_key.h" #include "chrome/browser/chromeos/login/owner_key_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" +#include "crypto/rsa_private_key.h" class FilePath; diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc index 46e5a6d..87ab4e1 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.cc +++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc @@ -14,8 +14,8 @@ #include "base/scoped_temp_dir.h" #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" @@ -161,8 +161,8 @@ class OwnerManagerTest : public testing::Test { FilePath tmpfile_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; std::vector<uint8> fake_public_key_; scoped_ptr<RSAPrivateKey> fake_private_key_; diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc index 486d9bd..d806674 100644 --- a/chrome/browser/chromeos/login/ownership_service.cc +++ b/chrome/browser/chromeos/login/ownership_service.cc @@ -12,7 +12,7 @@ #include "base/synchronization/lock.h" #include "chrome/browser/browser_process.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" namespace chromeos { diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h index 0c802eb..b121c5c 100644 --- a/chrome/browser/chromeos/login/ownership_service.h +++ b/chrome/browser/chromeos/login/ownership_service.h @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/login/owner_key_utils.h" #include "chrome/browser/chromeos/login/owner_manager.h" #include "chrome/browser/policy/proto/device_management_backend.pb.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/chromeos/login/ownership_service_unittest.cc b/chrome/browser/chromeos/login/ownership_service_unittest.cc index 100d055..b85df01 100644 --- a/chrome/browser/chromeos/login/ownership_service_unittest.cc +++ b/chrome/browser/chromeos/login/ownership_service_unittest.cc @@ -13,8 +13,8 @@ #include "base/scoped_temp_dir.h" #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/browser/chromeos/login/owner_manager_unittest.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "crypto/nss_util.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" @@ -70,8 +70,8 @@ class OwnershipServiceTest : public testing::Test { FilePath tmpfile_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; std::vector<uint8> fake_public_key_; scoped_ptr<RSAPrivateKey> fake_private_key_; diff --git a/chrome/browser/chromeos/login/ownership_status_checker.cc b/chrome/browser/chromeos/login/ownership_status_checker.cc index 4b7b98e..f85e1c7 100644 --- a/chrome/browser/chromeos/login/ownership_status_checker.cc +++ b/chrome/browser/chromeos/login/ownership_status_checker.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/login/ownership_status_checker.h" #include "base/bind.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index 9dd84c7..2777353 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -31,7 +31,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.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 "crypto/encryptor.h" #include "crypto/sha2.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 77ab2ce..d364e42 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -25,7 +25,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" @@ -225,9 +225,9 @@ class ParallelAuthenticatorTest : public testing::Test { } MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; std::string username_; std::string password_; diff --git a/chrome/browser/chromeos/login/profile_image_downloader.cc b/chrome/browser/chromeos/login/profile_image_downloader.cc index 50b1dfa..6a24629 100644 --- a/chrome/browser/chromeos/login/profile_image_downloader.cc +++ b/chrome/browser/chromeos/login/profile_image_downloader.cc @@ -19,7 +19,7 @@ #include "chrome/browser/profiles/profile_manager.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/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index a6f2b6c..f492a87 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -37,8 +37,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.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 "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/login/session_manager_observer.cc b/chrome/browser/chromeos/login/session_manager_observer.cc index 98630cb..b4401be 100644 --- a/chrome/browser/chromeos/login/session_manager_observer.cc +++ b/chrome/browser/chromeos/login/session_manager_observer.cc @@ -8,7 +8,7 @@ #include "chrome/browser/chromeos/login/signed_settings.h" #include "chrome/browser/chromeos/login/signed_settings_temp_storage.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" namespace chromeos { diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc index 63ab593..27c6794 100644 --- a/chrome/browser/chromeos/login/signed_settings.cc +++ b/chrome/browser/chromeos/login/signed_settings.cc @@ -21,7 +21,7 @@ #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { using google::protobuf::RepeatedPtrField; diff --git a/chrome/browser/chromeos/login/signed_settings_helper.cc b/chrome/browser/chromeos/login/signed_settings_helper.cc index b641b78..f0f53cd 100644 --- a/chrome/browser/chromeos/login/signed_settings_helper.cc +++ b/chrome/browser/chromeos/login/signed_settings_helper.cc @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/signed_settings.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc index e54318c..f7cc7e1 100644 --- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/login/signed_settings.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.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" @@ -103,8 +103,8 @@ class SignedSettingsHelperTest : public testing::Test, MockOwnershipService m_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; int pending_ops_; diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc index 9bebb7b..b546dae 100644 --- a/chrome/browser/chromeos/login/signed_settings_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/browser/chromeos/login/owner_manager_unittest.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -275,8 +275,8 @@ class SignedSettingsTest : public testing::Test { FilePath tmpfile_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; std::vector<uint8> fake_public_key_; scoped_ptr<crypto::RSAPrivateKey> fake_private_key_; diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc index f788b3a..822b6d6 100644 --- a/chrome/browser/chromeos/login/update_screen.cc +++ b/chrome/browser/chromeos/login/update_screen.cc @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/login/screen_observer.h" #include "chrome/browser/chromeos/login/update_screen_actor.h" #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc index d306f89..5643da7 100644 --- a/chrome/browser/chromeos/login/user_image_loader.cc +++ b/chrome/browser/chromeos/login/user_image_loader.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. @@ -8,9 +8,9 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "chrome/browser/chromeos/login/image_decoder.h" #include "chrome/browser/chromeos/login/helper.h" -#include "content/browser/browser_thread.h" +#include "chrome/browser/chromeos/login/image_decoder.h" +#include "content/public/browser/browser_thread.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index 9fcc17e..747f558 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -22,7 +22,6 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "crypto/nss_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -39,8 +38,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "crypto/nss_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc index 05b2a14..fc4529b 100644 --- a/chrome/browser/chromeos/media/media_player.cc +++ b/chrome/browser/chromeos/media/media_player.cc @@ -32,10 +32,10 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index ede93d3..67a584d 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.cc @@ -14,7 +14,7 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc index 50e09b7..b2ff758 100644 --- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc +++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h index ab8cc1d..498ad31 100644 --- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h +++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h @@ -21,7 +21,7 @@ #include "chrome/browser/ui/browser_list.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" struct DesktopNotificationHostMsg_Show_Params; @@ -91,7 +91,7 @@ class DesktopNotificationsTest : public testing::Test { // Create a message loop to allow notifications code to post tasks, // and a thread so that notifications code runs on the expected thread. MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // Mock local state. TestingPrefService local_state_; diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 3cfec2d..51ed11f 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -22,10 +22,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index ff2ddee..2570a48 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -6,10 +6,10 @@ #include "chrome/browser/chromeos/offline/offline_load_page.h" #include "chrome/browser/renderer_host/offline_resource_handler.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/common/view_messages.h" +#include "content/test/test_browser_thread.h" static const char* kURL1 = "http://www.google.com/"; static const char* kURL2 = "http://www.gmail.com/"; @@ -93,8 +93,8 @@ class OfflineLoadPageTest : public ChromeRenderViewHostTestHarness { private: UserResponse user_response_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; // Initializes / shuts down a stub CrosLibrary. chromeos::ScopedStubCrosEnabler stub_cros_enabler_; diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 399965d..47cd7e1 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -15,7 +15,7 @@ #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index dda6f91..e3e6385 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -415,8 +415,8 @@ class ProxyConfigServiceImplTest : public PlatformTest { ScopedStubCrosEnabler stub_cros_enabler_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<ProxyConfigServiceImpl> config_service_; }; diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index be06bfe..4a36034 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/logging.h" #include "base/command_line.h" +#include "base/logging.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" @@ -22,10 +22,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/common/url_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "chrome/common/url_constants.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc index 12d6d8c..5c58c6d 100644 --- a/chrome/browser/chromeos/system/statistics_provider.cc +++ b/chrome/browser/chromeos/system/statistics_provider.cc @@ -14,7 +14,7 @@ #include "base/time.h" #include "chrome/browser/chromeos/system/name_value_pairs_parser.h" #include "chrome/browser/chromeos/system/runtime_environment.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index 48352b0..48b8180 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -18,7 +18,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/memory_details.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index a3a08f2..101213b 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -8,13 +8,13 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/observer_list.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/observer_list.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/system/runtime_environment.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/touchpad_settings.cc b/chrome/browser/chromeos/system/touchpad_settings.cc index 449bdc5..0378a18 100644 --- a/chrome/browser/chromeos/system/touchpad_settings.cc +++ b/chrome/browser/chromeos/system/touchpad_settings.cc @@ -12,7 +12,7 @@ #include "base/process_util.h" #include "base/stringprintf.h" #include "chrome/browser/chromeos/system/runtime_environment.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/udev_info_provider.cc b/chrome/browser/chromeos/system/udev_info_provider.cc index 79d998d..852f80e 100644 --- a/chrome/browser/chromeos/system/udev_info_provider.cc +++ b/chrome/browser/chromeos/system/udev_info_provider.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chromeos/system/udev_info_provider.h" -#include "base/command_line.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/lazy_instance.h" #include "base/process_util.h" #include "base/string_util.h" #include "chrome/browser/chromeos/system/name_value_pairs_parser.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc index a23b396..084e842 100644 --- a/chrome/browser/chromeos/user_cros_settings_provider.cc +++ b/chrome/browser/chromeos/user_cros_settings_provider.cc @@ -29,7 +29,7 @@ #include "chrome/browser/ui/options/options_util.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/installer/util/google_update_settings.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" namespace chromeos { diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index cebed17..f4c5671 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -15,7 +15,7 @@ #include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 9c436ef..ef1d42c 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -36,7 +36,7 @@ #include "chrome/browser/internal_auth.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc index ad1fc42..e8cd4ae 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc @@ -21,7 +21,7 @@ #include "chrome/common/chrome_switches.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_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/component_updater/component_installers_unittest.cc b/chrome/browser/component_updater/component_installers_unittest.cc index 0825fc9..95fe7aa 100644 --- a/chrome/browser/component_updater/component_installers_unittest.cc +++ b/chrome/browser/component_updater/component_installers_unittest.cc @@ -12,7 +12,7 @@ #include "base/version.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" @@ -37,7 +37,7 @@ const FilePath::CharType kDataPath[] = // TODO(viettrungluu): Separate out into two separate tests; use a test fixture. TEST(ComponentInstallerTest, PepperFlashCheck) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); // The test directory is chrome/test/data/components/flapper. FilePath manifest; diff --git a/chrome/browser/component_updater/component_updater_interceptor.cc b/chrome/browser/component_updater/component_updater_interceptor.cc index 21695f1..b7728c8 100644 --- a/chrome/browser/component_updater/component_updater_interceptor.cc +++ b/chrome/browser/component_updater/component_updater_interceptor.cc @@ -5,7 +5,7 @@ #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/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc index 35dca35..26a08d0 100644 --- a/chrome/browser/component_updater/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/component_updater_service_unittest.cc @@ -10,12 +10,12 @@ #include "base/path_service.h" #include "base/values.h" #include "chrome/browser/component_updater/component_updater_interceptor.h" -#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_paths.h" #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "content/public/common/url_fetcher.h" #include "content/test/test_notification_tracker.h" @@ -178,7 +178,7 @@ class ComponentUpdaterTest : public testing::Test { return test_config_; } - void RegisterComponent(CrxComponent* com, + void RegisterComponent(CrxComponent* com, TestComponents component, const Version& version) { if (component == kTestComponent_abag) { @@ -212,7 +212,7 @@ TEST_F(ComponentUpdaterTest, VerifyFixture) { // if there is no work to do, there are no notifications generated. TEST_F(ComponentUpdaterTest, StartStop) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); component_updater()->Start(); message_loop.RunAllPending(); @@ -226,9 +226,9 @@ TEST_F(ComponentUpdaterTest, StartStop) { // are generated. TEST_F(ComponentUpdaterTest, CheckCrxSleep) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0)); file_thread.Start(); @@ -310,9 +310,9 @@ TEST_F(ComponentUpdaterTest, CheckCrxSleep) { // 3- second manifest check. TEST_F(ComponentUpdaterTest, InstallCrx) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0)); file_thread.Start(); @@ -324,7 +324,7 @@ TEST_F(ComponentUpdaterTest, InstallCrx) { RegisterComponent(&com1, kTestComponent_jebg, Version("0.9")); CrxComponent com2; RegisterComponent(&com2, kTestComponent_abag, Version("2.2")); - + const char expected_update_url_1[] = "http://localhost/upd?extra=foo&x=id%3D" "jebgalgnebhfojomionfpkfelancnnkf%26v%3D0.9%26uc&x=id%3D" @@ -376,9 +376,9 @@ TEST_F(ComponentUpdaterTest, InstallCrx) { // version is much higher than of chrome. TEST_F(ComponentUpdaterTest, ProdVersionCheck) { MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread file_thread(BrowserThread::FILE); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE); + content::TestBrowserThread io_thread(BrowserThread::IO); io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0)); file_thread.Start(); diff --git a/chrome/browser/component_updater/npapi_flash_component_installer.cc b/chrome/browser/component_updater/npapi_flash_component_installer.cc index 0403b04..997b008 100644 --- a/chrome/browser/component_updater/npapi_flash_component_installer.cc +++ b/chrome/browser/component_updater/npapi_flash_component_installer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/flash_component_installer.h" -#include "base/bind.h" #include "base/base_paths.h" +#include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" @@ -16,8 +16,8 @@ #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/plugin_prefs.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" +#include "content/public/browser/browser_thread.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/webplugininfo.h" diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 83e088f..e17a347 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -20,7 +20,7 @@ #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/plugin_prefs.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/pepper_plugin_info.h" #include "ppapi/c/private/ppb_pdf.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index ce3d0a9..ec53032 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/recovery_component_installer.h" -#include "base/bind.h" #include "base/base_paths.h" +#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_path.h" @@ -19,7 +19,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index 48d2d45..02d702a 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -18,8 +18,8 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc index 8ba6881..13594a16 100644 --- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -10,7 +10,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 "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,7 +28,7 @@ class DefaultProviderTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfile profile_; content_settings::DefaultProvider provider_; }; diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc index 342de2d..4c57b89 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/content_settings_pattern.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" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc index b3c5f9e..c08d833 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" +#include "testing/gtest/include/gtest/gtest.h" using ::testing::_; @@ -40,7 +40,7 @@ class PolicyProviderTest : public testing::Test { // BrowserThread IDs. Then we could get rid of the message_loop and ui_thread // fields. MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(PolicyProviderTest, DefaultGeolocationContentSetting) { diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index b445892..0ede36f 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -21,8 +21,8 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index 2099027..efd47f69 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -24,8 +24,8 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -123,7 +123,7 @@ class PrefProviderTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(PrefProviderTest, Observer) { diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc index 141ea67..da8614f 100644 --- a/chrome/browser/content_settings/cookie_settings.cc +++ b/chrome/browser/content_settings/cookie_settings.cc @@ -15,8 +15,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.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 "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc index e5ccacf..25d164e 100644 --- a/chrome/browser/content_settings/cookie_settings_unittest.cc +++ b/chrome/browser/content_settings/cookie_settings_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/static_cookie_policy.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,7 +29,7 @@ class CookieSettingsTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; const GURL kBlockedSite; const GURL kAllowedSite; const GURL kFirstPartySite; diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 5d491a5..ebf157e 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -26,8 +26,8 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/common/content_switches.h" diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 312f1d9..099d53d 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -17,6 +17,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/static_cookie_policy.h" #include "testing/gtest/include/gtest/gtest.h" @@ -47,7 +48,7 @@ class HostContentSettingsMapTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(HostContentSettingsMapTest, DefaultValues) { diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc index fbfe67a..7182ef9 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "net/base/cookie_monster.h" #include "testing/gtest/include/gtest/gtest.h" @@ -16,7 +16,7 @@ class TabSpecificContentSettingsTest : public ChromeRenderViewHostTestHarness { : browser_thread_(BrowserThread::UI, &message_loop_) {} private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettingsTest); }; diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc index ea34a09..0bb72ce 100644 --- a/chrome/browser/cookies_tree_model_unittest.cc +++ b/chrome/browser/cookies_tree_model_unittest.cc @@ -14,11 +14,12 @@ #include "chrome/browser/mock_browsing_data_database_helper.h" #include "chrome/browser/mock_browsing_data_file_system_helper.h" #include "chrome/browser/mock_browsing_data_indexed_db_helper.h" -#include "chrome/browser/mock_browsing_data_quota_helper.h" #include "chrome/browser/mock_browsing_data_local_storage_helper.h" +#include "chrome/browser/mock_browsing_data_quota_helper.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_types.h" +#include "content/test/test_browser_thread.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" @@ -272,8 +273,8 @@ class CookiesTreeModelTest : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<MockBrowsingDataCookieHelper> diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index 4ac6beb..c1c4b5c 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -29,7 +29,7 @@ #include "chrome/app/breakpad_linux.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using google_breakpad::ExceptionHandler; diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index b086a71..2c80d3a 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -6,16 +6,16 @@ #include <iterator> -#include "base/path_service.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/path_service.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #if defined(OS_WIN) #include "chrome/browser/crash_upload_list_win.h" #endif #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" CrashUploadList::CrashInfo::CrashInfo(const std::string& c, const base::Time& t) : crash_id(c), crash_time(t) {} diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 70f0ca3..dde6e71 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -17,8 +17,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/custom_handlers/protocol_handler.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/network_delegate.h" #include "net/url_request/url_request_redirect_job.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h index 7c2c38c..029801e 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.h +++ b/chrome/browser/custom_handlers/protocol_handler_registry.h @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/custom_handlers/protocol_handler.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" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index b02be86..168c463 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -15,11 +15,12 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/url_request/url_request.h" namespace { @@ -227,14 +228,14 @@ class ProtocolHandlerRegistryTest : public testing::Test { virtual void SetUp() { ui_message_loop_.reset(new MessageLoopForUI()); - ui_thread_.reset(new BrowserThread(BrowserThread::UI, - MessageLoop::current())); - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + MessageLoop::current())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); base::Thread::Options options; options.message_loop_type = MessageLoop::TYPE_IO; io_thread_->StartWithOptions(options); - file_thread_.reset(new BrowserThread(BrowserThread::FILE)); + file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE)); options.message_loop_type = MessageLoop::TYPE_DEFAULT; file_thread_->StartWithOptions(options); @@ -265,9 +266,9 @@ class ProtocolHandlerRegistryTest : public testing::Test { } scoped_ptr<MessageLoopForUI> ui_message_loop_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; - scoped_ptr<BrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; FakeDelegate* delegate_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc index bc6689e..65ec12a 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_protocol_handler.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/logging.h" -#include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/debugger/debugger_remote_service.h" -#include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/devtools_remote_listen_socket.h" +#include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/devtools_remote_service.h" #include "chrome/browser/debugger/extension_ports_remote_service.h" -#include "content/browser/browser_thread.h" +#include "chrome/browser/debugger/inspectable_tab_proxy.h" +#include "content/public/browser/browser_thread.h" // static scoped_refptr<DevToolsProtocolHandler> DevToolsProtocolHandler::Start( diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index feccbe8..58b905f 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> #include <set> +#include <string> #include "base/bind.h" #include "base/file_util.h" @@ -22,7 +22,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_buffer.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" @@ -33,6 +32,7 @@ #include "content/browser/download/download_status_updater.h" #include "content/browser/download/interrupt_reasons.h" #include "content/browser/download/mock_download_manager.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "net/base/io_buffer.h" #include "net/base/mock_file_stream.h" @@ -124,8 +124,8 @@ class DownloadManagerTest : public testing::Test { scoped_refptr<DownloadManager> download_manager_; scoped_refptr<DownloadFileManager> file_manager_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_refptr<content::DownloadBuffer> download_buffer_; DownloadFileManager* file_manager() { @@ -366,7 +366,7 @@ class ItemObserver : public DownloadItem::Observer { } // namespace TEST_F(DownloadManagerTest, StartDownload) { - BrowserThread io_thread(BrowserThread::IO, &message_loop_); + content::TestBrowserThread io_thread(BrowserThread::IO, &message_loop_); PrefService* prefs = profile_->GetPrefs(); prefs->SetFilePath(prefs::kDownloadDefaultDirectory, FilePath()); DownloadPrefs* download_prefs = diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index af24604..0dc6058 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -17,9 +17,9 @@ #include "chrome/browser/download/download_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_manager.h" #include "content/browser/download/save_package.h" +#include "content/public/browser/browser_thread.h" DownloadPrefs::DownloadPrefs(PrefService* prefs) : prefs_(prefs) { prompt_for_download_.Init(prefs::kPromptForDownload, prefs, NULL); diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index bf64eb1..a37a23d 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc @@ -9,14 +9,14 @@ #include "chrome/browser/download/download_request_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" +#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" -#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc index 18dd35d..d88fb94 100644 --- a/chrome/browser/download/download_request_limiter_unittest.cc +++ b/chrome/browser/download/download_request_limiter_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/download/download_request_limiter.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class DownloadRequestLimiterTest @@ -84,8 +84,8 @@ class DownloadRequestLimiterTest // Number of times ShouldAllowDownload was invoked. int ask_allow_count_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(DownloadRequestLimiterTest, Allow) { diff --git a/chrome/browser/download/download_safe_browsing_client.cc b/chrome/browser/download/download_safe_browsing_client.cc index 1cfced0..c9a45e6 100644 --- a/chrome/browser/download/download_safe_browsing_client.cc +++ b/chrome/browser/download/download_safe_browsing_client.cc @@ -14,10 +14,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_manager.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/public/browser/browser_thread.h" // TODO(lzheng): Get rid of the AddRef and Release after // SafeBrowsingService::Client is changed to RefCountedThreadSafe<>. diff --git a/chrome/browser/download/download_safe_browsing_client_unittest.cc b/chrome/browser/download/download_safe_browsing_client_unittest.cc index 05bc36e..b8ae9944 100644 --- a/chrome/browser/download/download_safe_browsing_client_unittest.cc +++ b/chrome/browser/download/download_safe_browsing_client_unittest.cc @@ -5,7 +5,7 @@ #include "base/message_loop.h" #include "chrome/browser/download/download_safe_browsing_client.h" #include "chrome/browser/safe_browsing/safe_browsing_service.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" @@ -41,7 +41,7 @@ class DownloadSBClientTest : public testing::Test { MessageLoop loop_; // UI thread to satisfy debug checks in DownloadSBClient. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(DownloadSBClientTest, UrlHit) { diff --git a/chrome/browser/download/download_test_observer.cc b/chrome/browser/download/download_test_observer.cc index 1d0c5b5..48d8367 100644 --- a/chrome/browser/download/download_test_observer.cc +++ b/chrome/browser/download/download_test_observer.cc @@ -10,7 +10,7 @@ #include "base/task.h" #include "chrome/browser/download/download_test_observer.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // These functions take scoped_refptr's to DownloadManager because they // are posted to message queues, and hence may execute arbitrarily after diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index d70d650..21a85cc 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -31,7 +31,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/time_format.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" #include "content/browser/download/download_item.h" @@ -40,6 +39,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index d9c0de4..67b0b47 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/string16.h" #include "base/timer.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" class EnumerateModulesModel; 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" diff --git a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc index 77246c8..739f07e 100644 --- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc +++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/external_protocol/external_protocol_handler.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class FakeExternalProtocolHandlerWorker @@ -122,8 +122,8 @@ class ExternalProtocolHandlerTest : public testing::Test { } MessageLoopForUI ui_message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; FakeExternalProtocolHandlerDelegate delegate_; }; diff --git a/chrome/browser/fast_shutdown_uitest.cc b/chrome/browser/fast_shutdown_uitest.cc index a7f1c00..0237fe4 100644 --- a/chrome/browser/fast_shutdown_uitest.cc +++ b/chrome/browser/fast_shutdown_uitest.cc @@ -13,7 +13,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" class FastShutdown : public UITest { protected: @@ -70,8 +70,8 @@ class FastShutdown : public UITest { to_notify->PostTask(FROM_HERE, new MessageLoop::QuitTask()); } - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<base::ThreadTestHelper> thread_helper_; FilePath user_data_dir_; diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc index c6792c5..ce38af0 100644 --- a/chrome/browser/geolocation/access_token_store_browsertest.cc +++ b/chrome/browser/geolocation/access_token_store_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/geolocation/chrome_access_token_store.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" namespace { diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc index 702e0dd..3f4b1f0 100644 --- a/chrome/browser/geolocation/chrome_access_token_store.cc +++ b/chrome/browser/geolocation/chrome_access_token_store.cc @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index a9c98d2..c3569e0 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -22,10 +22,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/geolocation/geolocation_provider.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_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index ac3788b..b89c993 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -14,18 +14,18 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h" #include "content/browser/geolocation/location_arbitrator.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/mock_location_provider.h" #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "chrome/common/chrome_notification_types.h" #include "content/common/geolocation_messages.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" // ClosedDelegateTracker ------------------------------------------------------ @@ -126,7 +126,7 @@ class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness { virtual void SetUp(); virtual void TearDown(); - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<GeolocationArbitratorDependencyFactory> dependency_factory_; }; diff --git a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc index 38feb7b..79bcc88 100644 --- a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc +++ b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc @@ -7,9 +7,9 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -22,7 +22,7 @@ class GeolocationSettingsStateTests : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(GeolocationSettingsStateTests, ClearOnNewOrigin) { diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc index 3abb2d9..13f11d3 100644 --- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc +++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { // The time periods between successive polls of the wifi data. diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index b3f69ba..0403663 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -21,7 +21,7 @@ #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "google_update_idl_i.c" #include "views/widget/widget.h" diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index 18fd763..e38a140 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -13,9 +13,9 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_fetcher.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context_getter.h" @@ -133,7 +133,7 @@ class GoogleURLTrackerTest : public testing::Test { private: MessageLoop message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; ScopedTestingLocalState local_state_; diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 5b48622..e0d0685 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -11,9 +11,9 @@ #include "base/file_path.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_persistent_store_info.h" +#include "content/public/browser/browser_thread.h" #include "sql/statement.h" namespace history { diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index b5fbf4f..415db58 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -27,7 +27,7 @@ #include "chrome/common/thumbnail_score.h" #include "chrome/test/base/testing_profile.h" #include "chrome/tools/profiles/thumbnail-inl.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" @@ -103,8 +103,8 @@ class ExpireHistoryTest : public testing::Test, BookmarkModel bookmark_model_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; ExpireHistoryBackend expirer_; diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 00b3450..583e106 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -47,8 +47,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_persistent_store_info.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/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index a2dc9f3..6f37766 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/history/shortcuts_backend.cc b/chrome/browser/history/shortcuts_backend.cc index c07ab8e..b65b56b 100644 --- a/chrome/browser/history/shortcuts_backend.cc +++ b/chrome/browser/history/shortcuts_backend.cc @@ -21,7 +21,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/guid.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/history/shortcuts_backend_unittest.cc b/chrome/browser/history/shortcuts_backend_unittest.cc index cc38425..515232e 100644 --- a/chrome/browser/history/shortcuts_backend_unittest.cc +++ b/chrome/browser/history/shortcuts_backend_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/history/shortcuts_backend.h" #include "chrome/browser/history/shortcuts_database.h" #include "chrome/common/guid.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" @@ -43,8 +43,8 @@ class ShortcutsBackendTest : public testing::Test, ScopedTempDir temp_dir_; scoped_refptr<ShortcutsBackend> backend_; MessageLoopForUI ui_message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; bool load_notified_; }; diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 14f5290..f1749af 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -27,11 +27,11 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/thumbnail_score.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc index 94355cc..f0db0fe 100644 --- a/chrome/browser/history/top_sites_backend.cc +++ b/chrome/browser/history/top_sites_backend.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. @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "chrome/browser/history/top_sites_database.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace history { diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc index b23aa66..8f55eec 100644 --- a/chrome/browser/history/top_sites_unittest.cc +++ b/chrome/browser/history/top_sites_unittest.cc @@ -29,7 +29,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/tools/profiles/thumbnail-inl.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -317,8 +317,8 @@ class TopSitesTest : public HistoryUnitTestBase { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_ptr<TestingProfile> profile_; CancelableRequestConsumer consumer_; CommandLine original_command_line_; diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index de8d08b..5ce4e11 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -5,7 +5,7 @@ #include "chrome/browser/icon_loader.h" #include "base/basictypes.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index 2d9c097..0ffa458 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc @@ -14,8 +14,8 @@ #include "chrome/browser/importer/profile_import_process_messages.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h index 81ba8fc..6dcc6f9 100644 --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h @@ -14,8 +14,8 @@ #include "base/string16.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/profile_writer.h" -#include "content/browser/browser_thread.h" #include "content/browser/utility_process_host.h" +#include "content/public/browser/browser_thread.h" class ExternalProcessImporterHost; class InProcessImporterBridge; diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index e183f76..512b5e1 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -21,7 +21,7 @@ #include "chrome/browser/importer/nss_decryptor.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/time_format.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "sql/connection.h" diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index f5fc1bc..a49fbf2 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/browser_list.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_source.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h index 8228218..0b58506 100644 --- a/chrome/browser/importer/importer_list.h +++ b/chrome/browser/importer/importer_list.h @@ -12,19 +12,14 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/string16.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context_getter.h" - namespace importer { class ImporterListObserver; struct SourceProfile; } -namespace net { -class URLRequestContextGetter; -} - class ImporterList : public base::RefCountedThreadSafe<ImporterList> { public: explicit ImporterList(net::URLRequestContextGetter* request_context_getter); diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index e72d4e7..5de304c 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -34,7 +34,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/chrome_paths.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" #include "webkit/glue/password_form.h" @@ -121,8 +121,8 @@ class ImporterTest : public testing::Test { ScopedTempDir temp_dir_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; FilePath profile_path_; FilePath app_path_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc index d319c51..7290028 100644 --- a/chrome/browser/importer/in_process_importer_bridge.cc +++ b/chrome/browser/importer/in_process_importer_bridge.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/importer_host.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 1a4a996..ec610ca 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -16,7 +16,7 @@ #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/libxml_utils.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/toolbar_importer_utils.cc b/chrome/browser/importer/toolbar_importer_utils.cc index 45b390b..555b5a7 100644 --- a/chrome/browser/importer/toolbar_importer_utils.cc +++ b/chrome/browser/importer/toolbar_importer_utils.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/string_split.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_store.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc index 32dcfac..f13920b 100644 --- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc +++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/web_intent_service_data.h" @@ -54,7 +54,7 @@ class RegisterIntentHandlerInfoBarDelegateTest MockWebIntentsRegistry* web_intents_registry_; private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(RegisterIntentHandlerInfoBarDelegateTest); }; diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc index b2d0e05..6aaa541 100644 --- a/chrome/browser/intents/web_intents_registry_unittest.cc +++ b/chrome/browser/intents/web_intents_registry_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_paths.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -131,8 +132,8 @@ class WebIntentsRegistryTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<WebDataService> wds_; MockExtensionService extensionService_; ExtensionList extensions_; diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index faa44e1..16448df 100644 --- a/chrome/browser/internal_auth.cc +++ b/chrome/browser/internal_auth.cc @@ -10,14 +10,14 @@ #include "base/base64.h" #include "base/lazy_instance.h" #include "base/rand_util.h" -#include "base/synchronization/lock.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "base/time.h" #include "base/values.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "crypto/hmac.h" namespace { diff --git a/chrome/browser/internal_auth_unittest.cc b/chrome/browser/internal_auth_unittest.cc index 7ee68eb..cf70804 100644 --- a/chrome/browser/internal_auth_unittest.cc +++ b/chrome/browser/internal_auth_unittest.cc @@ -8,7 +8,7 @@ #include "base/lazy_instance.h" #include "base/time.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace browser { diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 32acf59..8781125 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -19,8 +19,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "chrome/browser/media/media_internals.h" -#include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/browser/net/chrome_net_log.h" +#include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/connect_interceptor.h" #include "chrome/browser/net/passive_log_collector.h" @@ -30,9 +30,9 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/in_process_webkit/indexed_db_key_utility_client.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/cert_verifier.h" @@ -340,7 +340,7 @@ IOThread::IOThread( PrefService* local_state, ChromeNetLog* net_log, ExtensionEventRouterForwarder* extension_event_router_forwarder) - : BrowserProcessSubThread(BrowserThread::IO), + : content::BrowserProcessSubThread(BrowserThread::IO), net_log_(net_log), extension_event_router_forwarder_(extension_event_router_forwarder), globals_(NULL), @@ -399,7 +399,7 @@ void IOThread::Init() { // messages around; it shouldn't be allowed to perform any blocking disk I/O. base::ThreadRestrictions::SetIOAllowed(false); - BrowserProcessSubThread::Init(); + content::BrowserProcessSubThread::Init(); DCHECK_EQ(MessageLoop::TYPE_IO, message_loop()->type()); @@ -515,7 +515,7 @@ void IOThread::CleanUp() { // This will delete the |notification_service_|. Make sure it's done after // anything else can reference it. - BrowserProcessSubThread::CleanUp(); + content::BrowserProcessSubThread::CleanUp(); } // static diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index b4fd0a8..1918e6e 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -7,6 +7,7 @@ #pragma once #include <string> + #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -48,7 +49,7 @@ class URLRequestContextGetter; class URLSecurityManager; } // namespace net -class IOThread : public BrowserProcessSubThread { +class IOThread : public content::BrowserProcessSubThread { public: struct Globals { Globals(); diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc index e9919e5..42c7887 100644 --- a/chrome/browser/jankometer.cc +++ b/chrome/browser/jankometer.cc @@ -19,7 +19,7 @@ #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index b450034..8aef301 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -35,7 +35,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.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_source.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc index d9e04f4..026422d 100644 --- a/chrome/browser/media/media_internals.cc +++ b/chrome/browser/media/media_internals.cc @@ -8,8 +8,8 @@ #include "base/string16.h" #include "base/stringprintf.h" #include "chrome/browser/media/media_internals_observer.h" -#include "content/browser/browser_thread.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/browser_thread.h" #include "media/base/media_log.h" #include "media/base/media_log_event.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index dc2bcb5..d6a1452 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -13,24 +13,24 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.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_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store_manager.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/bindings_policy.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) -#include "content/browser/zygote_host_linux.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/browser/zygote_host_linux.h" #endif ProcessMemoryInformation::ProcessMemoryInformation() diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index 603dfff..f7a4a5d 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -4,23 +4,23 @@ #include "chrome/browser/memory_details.h" -#include <unistd.h> -#include <fcntl.h> #include <dirent.h> +#include <fcntl.h> +#include <unistd.h> #include <set> #include "base/bind.h" #include "base/eintr_wrapper.h" #include "base/file_version_info.h" -#include "base/string_util.h" #include "base/process_util.h" +#include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/zygote_host_linux.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" // Known browsers which we collect details for. diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index 1c1e7e0..0f64955 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -12,8 +12,8 @@ #include "base/file_path.h" #include "base/file_version_info.h" #include "base/mac/mac_util.h" -#include "base/string_util.h" #include "base/process_util.h" +#include "base/string_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/process_info_snapshot.h" @@ -21,10 +21,10 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store_manager.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 73fa325..2abf2d7 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -16,10 +16,10 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store_manager.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/metrics/field_trial_synchronizer.cc b/chrome/browser/metrics/field_trial_synchronizer.cc index 7a04701..d66c076 100644 --- a/chrome/browser/metrics/field_trial_synchronizer.cc +++ b/chrome/browser/metrics/field_trial_synchronizer.cc @@ -8,8 +8,8 @@ #include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/render_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/public/browser/browser_thread.h" FieldTrialSynchronizer::FieldTrialSynchronizer() { DCHECK(field_trial_synchronizer_ == NULL); diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc index 8edf732..11149e3 100644 --- a/chrome/browser/metrics/histogram_synchronizer.cc +++ b/chrome/browser/metrics/histogram_synchronizer.cc @@ -1,16 +1,16 @@ -// 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. #include "chrome/browser/metrics/histogram_synchronizer.h" -#include "base/metrics/histogram.h" #include "base/logging.h" +#include "base/metrics/histogram.h" #include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/render_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/public/browser/browser_thread.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index 2364275..a906c78 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -59,7 +59,7 @@ #include "base/threading/thread.h" #include "base/threading/watchdog.h" #include "base/time.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/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index 53999f86..bd95368 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -18,6 +18,7 @@ #include "build/build_config.h" #include "chrome/browser/metrics/thread_watcher.h" #include "chrome/common/chrome_switches.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -248,8 +249,9 @@ class ThreadWatcherTest : public ::testing::Test { ThreadWatcherTest() : setup_complete_(&lock_), initialized_(false) { - webkit_thread_.reset(new BrowserThread(BrowserThread::WEBKIT)); - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + webkit_thread_.reset(new content::TestBrowserThread( + BrowserThread::WEBKIT)); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); watchdog_thread_.reset(new WatchDogThread()); webkit_thread_->Start(); io_thread_->Start(); @@ -309,8 +311,8 @@ class ThreadWatcherTest : public ::testing::Test { base::Lock lock_; base::ConditionVariable setup_complete_; bool initialized_; - scoped_ptr<BrowserThread> webkit_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> webkit_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<WatchDogThread> watchdog_thread_; }; diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index 19f3ae3..4eaec72 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -13,7 +13,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/cert_test_util.h" #include "net/base/ssl_info.h" #include "net/base/transport_security_state.h" @@ -180,21 +180,21 @@ TEST(ChromeFraudulentCertificateReporterTest, GoodBadInfo) { TEST(ChromeFraudulentCertificateReporterTest, ReportIsSent) { MessageLoop loop(MessageLoop::TYPE_IO); - BrowserThread io_thread(BrowserThread::IO, &loop); + content::TestBrowserThread io_thread(BrowserThread::IO, &loop); loop.PostTask(FROM_HERE, base::Bind(&DoReportIsSent)); loop.RunAllPending(); } TEST(ChromeFraudulentCertificateReporterTest, MockReportIsSent) { MessageLoop loop(MessageLoop::TYPE_IO); - BrowserThread io_thread(BrowserThread::IO, &loop); + content::TestBrowserThread io_thread(BrowserThread::IO, &loop); loop.PostTask(FROM_HERE, base::Bind(&DoMockReportIsSent)); loop.RunAllPending(); } TEST(ChromeFraudulentCertificateReporterTest, ReportIsNotSent) { MessageLoop loop(MessageLoop::TYPE_IO); - BrowserThread io_thread(BrowserThread::IO, &loop); + content::TestBrowserThread io_thread(BrowserThread::IO, &loop); loop.PostTask(FROM_HERE, base::Bind(&DoReportIsNotSent)); loop.RunAllPending(); } diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index b6a41b7..21e16d7 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -13,7 +13,7 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 8f2807fe..7f68f33 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -15,10 +15,10 @@ #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" -#include "content/public/common/content_client.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/public/common/content_client.h" #include "net/base/cookie_store.h" #include "net/http/http_util.h" diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 258c62e..53ebe47 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/net/connection_tester.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/dnsrr_resolver.h" @@ -101,7 +101,7 @@ class ConnectionTesterTest : public PlatformTest { // MessageLoop is already destroyed, then the RemoveObserver will be a // no-op, and the ObserverList will contain invalid entries. MessageLoop message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; net::TestServer test_server_; ConnectionTesterDelegate test_delegate_; net::MockHostResolver host_resolver_; diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index e3fa8d8..66daec5 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -7,13 +7,13 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/rand_util.h" -#include "base/time.h" #include "base/string_number_conversions.h" +#include "base/time.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/crl_set.h" #include "net/base/ssl_config_service.h" diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index 63c7c90..24687ac 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -11,7 +11,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.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/browser/notification_source.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h index 689d3b5..fd3802b 100644 --- a/chrome/browser/net/gaia/token_service_unittest.h +++ b/chrome/browser/net/gaia/token_service_unittest.h @@ -16,6 +16,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_notification_tracker.h" #include "testing/gtest/include/gtest/gtest.h" @@ -68,8 +69,8 @@ class TokenServiceTestHarness : public testing::Test { void WaitForDBLoadCompletion(); MessageLoopForUI message_loop_; - BrowserThread ui_thread_; // Mostly so DCHECKS pass. - BrowserThread db_thread_; // WDS on here + content::TestBrowserThread ui_thread_; // Mostly so DCHECKS pass. + content::TestBrowserThread db_thread_; // WDS on here TokenService service_; TokenAvailableTracker success_tracker_; diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc index 995456e..b421bc3 100644 --- a/chrome/browser/net/http_server_properties_manager.cc +++ b/chrome/browser/net/http_server_properties_manager.cc @@ -9,7 +9,7 @@ #include "chrome/browser/prefs/pref_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" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/net/http_server_properties_manager_unittest.cc b/chrome/browser/net/http_server_properties_manager_unittest.cc index 6dfecc8..5ce93e9 100644 --- a/chrome/browser/net/http_server_properties_manager_unittest.cc +++ b/chrome/browser/net/http_server_properties_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/values.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.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" @@ -164,8 +164,8 @@ class HttpServerPropertiesManagerTest : public testing::Test { scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_; private: - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest); }; diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc index 87be841..1d01941 100644 --- a/chrome/browser/net/load_timing_observer.cc +++ b/chrome/browser/net/load_timing_observer.cc @@ -6,8 +6,8 @@ #include "base/time.h" #include "chrome/browser/net/chrome_net_log.h" -#include "content/browser/browser_thread.h" #include "content/common/resource_response.h" +#include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_netlog_params.h" diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc index 559fb81..c255572 100644 --- a/chrome/browser/net/load_timing_observer_unittest.cc +++ b/chrome/browser/net/load_timing_observer_unittest.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. @@ -8,7 +8,7 @@ #include "base/format_macros.h" #include "base/stringprintf.h" #include "base/time.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_netlog_params.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ class LoadTimingObserverTest : public testing::Test { private: MessageLoop message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; }; base::TimeTicks current_time; diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc index c4d1d6a..c270676 100644 --- a/chrome/browser/net/net_pref_observer.cc +++ b/chrome/browser/net/net_pref_observer.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.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" #include "net/http/http_stream_factory.h" #include "net/url_request/url_request_throttler_manager.h" diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index 036b3708..1cbddcf 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -14,7 +14,7 @@ #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/tuple.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/net/preconnect.cc b/chrome/browser/net/preconnect.cc index 56342df..ef795e6 100644 --- a/chrome/browser/net/preconnect.cc +++ b/chrome/browser/net/preconnect.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_log.h" #include "net/base/ssl_config_service.h" #include "net/http/http_network_session.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 20fa822..f108bc1 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -26,7 +26,7 @@ #include "chrome/browser/prefs/session_startup_pref.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 "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index c2426c8..d92775c 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_info.h" #include "chrome/common/net/predictor_common.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/address_list.h" #include "net/base/mock_host_resolver.h" #include "net/base/winsock_init.h" @@ -99,8 +99,8 @@ class PredictorTest : public testing::Test { // must not outlive the message loop, otherwise bad things can happen // (like posting to a deleted message loop). MessageLoopForUI loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; protected: scoped_ptr<net::MockCachingHostResolver> host_resolver_; diff --git a/chrome/browser/net/pref_proxy_config_service.cc b/chrome/browser/net/pref_proxy_config_service.cc index 3305e6c..d6bb631 100644 --- a/chrome/browser/net/pref_proxy_config_service.cc +++ b/chrome/browser/net/pref_proxy_config_service.cc @@ -10,7 +10,7 @@ #include "chrome/browser/prefs/proxy_config_dictionary.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" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/net/pref_proxy_config_service_unittest.cc b/chrome/browser/net/pref_proxy_config_service_unittest.cc index e0ef84a..ca98763 100644 --- a/chrome/browser/net/pref_proxy_config_service_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_service_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -102,8 +102,8 @@ class PrefProxyConfigServiceTestBase : public TESTBASE { private: scoped_refptr<PrefProxyConfigTracker> proxy_config_tracker_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; class PrefProxyConfigServiceTest diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index 1031dcf..dacf99d 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/string_number_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/browser/io_thread.h" +#include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_log.h" #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" #include "net/proxy/proxy_config_service.h" diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store.cc b/chrome/browser/net/sqlite_origin_bound_cert_store.cc index 9e77277..0d178f9 100644 --- a/chrome/browser/net/sqlite_origin_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_origin_bound_cert_store.cc @@ -15,7 +15,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "sql/meta_table.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc index aae87a9..c0606b6 100644 --- a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc +++ b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc @@ -10,7 +10,7 @@ #include "base/test/thread_test_helper.h" #include "chrome/browser/net/sqlite_origin_bound_cert_store.h" #include "chrome/common/chrome_constants.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class SQLiteOriginBoundCertStoreTest : public testing::Test { @@ -34,7 +34,7 @@ class SQLiteOriginBoundCertStoreTest : public testing::Test { "https://encrypted.google.com:8443", "a", "b")); } - BrowserThread db_thread_; + content::TestBrowserThread db_thread_; ScopedTempDir temp_dir_; scoped_refptr<SQLiteOriginBoundCertStore> store_; }; diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 632802b..2e58f62 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -22,7 +22,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" #include "sql/meta_table.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc index 03de457..8148c21 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc @@ -11,7 +11,7 @@ #include "base/test/thread_test_helper.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/common/chrome_constants.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" @@ -79,8 +79,8 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test { } protected: - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; base::WaitableEvent loaded_event_; base::WaitableEvent key_loaded_event_; std::vector<net::CookieMonster::CanonicalCookie*> cookies_; diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc index 55b22d7..8db113b 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -13,7 +13,7 @@ #include "base/time.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/common/chrome_constants.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" @@ -74,9 +74,9 @@ class SQLitePersistentCookieStoreTest : public testing::Test { } protected: - BrowserThread ui_thread_; - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; base::WaitableEvent loaded_event_; base::WaitableEvent key_loaded_event_; base::WaitableEvent db_thread_event_; diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index fb11c82..ffb1394 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -16,7 +16,7 @@ #include "chrome/common/chrome_notification_types.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/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "net/base/ssl_cipher_suite_names.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index fe744e7..0d3e906 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/ssl_config_service.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,9 +25,9 @@ class SSLConfigServiceManagerPrefTest : public testing::Test { virtual void SetUp() { message_loop_.reset(new MessageLoop()); ui_thread_.reset( - new BrowserThread(BrowserThread::UI, message_loop_.get())); + new content::TestBrowserThread(BrowserThread::UI, message_loop_.get())); io_thread_.reset( - new BrowserThread(BrowserThread::IO, message_loop_.get())); + new content::TestBrowserThread(BrowserThread::IO, message_loop_.get())); pref_service_.reset(new TestingPrefService()); SSLConfigServiceManager::RegisterPrefs(pref_service_.get()); } @@ -41,8 +41,8 @@ class SSLConfigServiceManagerPrefTest : public testing::Test { protected: scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<TestingPrefService> pref_service_; }; diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc index c0b1fbb..026cc2f 100644 --- a/chrome/browser/net/url_request_mock_util.cc +++ b/chrome/browser/net/url_request_mock_util.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. @@ -10,11 +10,11 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/net/url_request_mock_link_doctor_job.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/net/url_request_failed_dns_job.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/browser/net/url_request_slow_download_job.h" #include "content/browser/net/url_request_slow_http_job.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_filter.h" namespace chrome_browser_net { diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 4a43f94..c87d27f 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -28,12 +28,12 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/common/desktop_notification_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/notifications/desktop_notification_service_factory.cc b/chrome/browser/notifications/desktop_notification_service_factory.cc index 122b080..7de59e6 100644 --- a/chrome/browser/notifications/desktop_notification_service_factory.cc +++ b/chrome/browser/notifications/desktop_notification_service_factory.cc @@ -8,7 +8,7 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // static DesktopNotificationService* DesktopNotificationServiceFactory::GetForProfile( diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc index 008589f..97af96a 100644 --- a/chrome/browser/notifications/desktop_notification_service_unittest.cc +++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" @@ -27,10 +27,11 @@ class ThreadProxy : public base::RefCountedThreadSafe<ThreadProxy> { permission_(WebKit::WebNotificationPresenter::PermissionAllowed) { // The current message loop was already initalized by the test superclass. ui_thread_.reset( - new BrowserThread(BrowserThread::UI, MessageLoop::current())); + new content::TestBrowserThread(BrowserThread::UI, + MessageLoop::current())); // Create IO thread, start its message loop. - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); io_thread_->Start(); // Calling PauseIOThread() here isn't safe, because the runnable method @@ -84,8 +85,8 @@ class ThreadProxy : public base::RefCountedThreadSafe<ThreadProxy> { base::WaitableEvent io_event_; base::WaitableEvent ui_event_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; WebKit::WebNotificationPresenter::Permission permission_; }; diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h index 1c71ce2..44c64f8 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.h +++ b/chrome/browser/notifications/desktop_notifications_unittest.h @@ -17,7 +17,7 @@ #include "chrome/browser/notifications/notification_ui_manager.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 DesktopNotificationsTest; @@ -96,7 +96,7 @@ class DesktopNotificationsTest : public testing::Test { // Create a message loop to allow notifications code to post tasks, // and a thread so that notifications code runs on the expected thread. MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // Local state mock. TestingPrefService local_state_; diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index 727c43e..6ca3851 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -9,8 +9,8 @@ #include "base/process.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string16.h" +#include "base/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/timer.h" @@ -20,11 +20,11 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/zygote_host_linux.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index eed6a97..665852c 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -16,10 +16,10 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index f35209b..552ea13 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using webkit_glue::PasswordForm; @@ -377,8 +378,8 @@ class NativeBackendGnomeTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; TestingProfile profile_; diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index f2f7617..1bf6df3 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -12,7 +12,7 @@ #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_proxy.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 9df5d13..89bde93 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "dbus/message.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" @@ -165,8 +166,8 @@ class NativeBackendKWalletTest : public testing::Test { const ExpectationArray& sorted_expected); MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; TestingProfile profile_; scoped_refptr<dbus::MockBus> mock_session_bus_; diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index 57fa2a1..10d30ba 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.cc @@ -13,10 +13,10 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" using webkit_glue::PasswordForm; using testing::_; @@ -118,7 +118,7 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness { PasswordManager* manager() { return manager_.get(); } // We create a UI thread to satisfy PasswordStore. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<MockPasswordStore> store_; MockPasswordManagerDelegate delegate_; // Owned by manager_. diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc index 56476ba..8643281 100644 --- a/chrome/browser/password_manager/password_store.cc +++ b/chrome/browser/password_manager/password_store.cc @@ -9,7 +9,7 @@ #include "base/stl_util.h" #include "base/task.h" #include "chrome/browser/password_manager/password_store_consumer.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/glue/password_form.h" using std::vector; diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc index c30dd2f..fc94580 100644 --- a/chrome/browser/password_manager/password_store_default.cc +++ b/chrome/browser/password_manager/password_store_default.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_constants.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_service.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index bb89510..c5b71c3 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -23,6 +23,7 @@ #include "content/public/browser/notification_registrar.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 "testing/gtest/include/gtest/gtest.h" @@ -127,8 +128,9 @@ class PasswordStoreDefaultTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread ui_thread_; + // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread db_thread_; scoped_ptr<LoginDatabase> login_db_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 67a809a5..76603da 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/password_manager/password_store_mac.h" #include "chrome/browser/password_manager/password_store_mac_internal.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" using webkit_glue::PasswordForm; using testing::_; @@ -920,7 +920,7 @@ class PasswordStoreMacTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; MockKeychain* keychain_; // Owned by store_. LoginDatabase* login_db_; // Owned by store_. diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 6b187c2..452b0ca 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -22,7 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/signaling_task.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" @@ -124,8 +124,9 @@ class PasswordStoreWinTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread ui_thread_; + // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread db_thread_; scoped_ptr<LoginDatabase> login_db_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index c011ade..b55a15f 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/chrome/browser/password_manager/password_store_x.cc @@ -13,9 +13,9 @@ #include "base/stl_util.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/pref_names.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" using std::vector; diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index a550abd..ff4317d 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -28,6 +28,7 @@ #include "content/public/browser/notification_registrar.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 "testing/gtest/include/gtest/gtest.h" @@ -313,8 +314,9 @@ class PasswordStoreXTest : public testing::TestWithParam<BackendType> { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread ui_thread_; + // PasswordStore, WDS schedule work on this thread. + content::TestBrowserThread db_thread_; scoped_ptr<LoginDatabase> login_db_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index 28e1c9d..68fd528 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -9,11 +9,11 @@ #include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/file_manager_util.h" +#include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/tabs/tab_strip_model.h" -#include "content/browser/browser_thread.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc index 9303e42..c7106ac 100644 --- a/chrome/browser/plugin_data_remover.cc +++ b/chrome/browser/plugin_data_remover.cc @@ -13,9 +13,9 @@ #include "chrome/browser/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" #include "content/common/plugin_messages.h" +#include "content/public/browser/browser_thread.h" #include "webkit/plugins/npapi/plugin_group.h" #if defined(OS_POSIX) diff --git a/chrome/browser/plugin_data_remover_helper.cc b/chrome/browser/plugin_data_remover_helper.cc index e922cc3..24d238c 100644 --- a/chrome/browser/plugin_data_remover_helper.cc +++ b/chrome/browser/plugin_data_remover_helper.cc @@ -12,8 +12,8 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" PluginDataRemoverHelper::PluginDataRemoverHelper() diff --git a/chrome/browser/plugin_download_helper.cc b/chrome/browser/plugin_download_helper.cc index 1132fb2..d522dd8 100644 --- a/chrome/browser/plugin_download_helper.cc +++ b/chrome/browser/plugin_download_helper.cc @@ -8,7 +8,7 @@ #include <windows.h> #include "base/file_util.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc index 27c30c2..f1ed730 100644 --- a/chrome/browser/plugin_prefs.cc +++ b/chrome/browser/plugin_prefs.cc @@ -28,8 +28,8 @@ #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/browser/plugin_service.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/plugin_prefs_unittest.cc b/chrome/browser/plugin_prefs_unittest.cc index 6ee2317..4dbb1bf 100644 --- a/chrome/browser/plugin_prefs_unittest.cc +++ b/chrome/browser/plugin_prefs_unittest.cc @@ -8,6 +8,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/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/npapi/mock_plugin_list.cc" #include "webkit/plugins/webplugininfo.h" @@ -132,8 +133,8 @@ TEST_F(PluginPrefsTest, EnabledAndDisabledByPolicy) { TEST_F(PluginPrefsTest, DisableGlobally) { 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); TestingBrowserProcess* browser_process = static_cast<TestingBrowserProcess*>(g_browser_process); diff --git a/chrome/browser/policy/asynchronous_policy_loader.cc b/chrome/browser/policy/asynchronous_policy_loader.cc index 296f7a5..a31babf 100644 --- a/chrome/browser/policy/asynchronous_policy_loader.cc +++ b/chrome/browser/policy/asynchronous_policy_loader.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace policy { diff --git a/chrome/browser/policy/asynchronous_policy_test_base.h b/chrome/browser/policy/asynchronous_policy_test_base.h index 373c5a3..7e11d29 100644 --- a/chrome/browser/policy/asynchronous_policy_test_base.h +++ b/chrome/browser/policy/asynchronous_policy_test_base.h @@ -9,7 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/policy/asynchronous_policy_provider.h" -#include "content/browser/browser_thread.h" +#include "content/public/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" @@ -44,8 +45,8 @@ class AsynchronousPolicyTestBase : public testing::Test { scoped_ptr<ProviderDelegateMock> delegate_; private: - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(AsynchronousPolicyTestBase); }; diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc index 4182195..a110629 100644 --- a/chrome/browser/policy/cloud_policy_controller_unittest.cc +++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/policy/cloud_policy_controller.h" -#include "base/message_loop.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "chrome/browser/policy/cloud_policy_data_store.h" #include "chrome/browser/policy/device_token_fetcher.h" @@ -14,7 +14,7 @@ #include "chrome/browser/policy/mock_device_management_service.h" #include "chrome/browser/policy/policy_notifier.h" #include "chrome/browser/policy/user_policy_cache.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -92,8 +92,8 @@ class CloudPolicyControllerTest : public testing::Test { MessageLoop loop_; private: - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(CloudPolicyControllerTest); }; diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc index d495fd0..1f80df0 100644 --- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc +++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc @@ -19,7 +19,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -230,8 +230,8 @@ class CloudPolicySubsystemTestBase : public TESTBASE { ScopedTempDir temp_user_data_dir_; MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<EventLogger> logger_; scoped_ptr<CloudPolicyDataStore> data_store_; diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index c53496f..1b8e3e0 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/policy/config_dir_policy_provider.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/policy_map.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -181,8 +181,8 @@ class ConfigDirPolicyProviderValueTest private: MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; TEST_P(ConfigDirPolicyProviderValueTest, Default) { diff --git a/chrome/browser/policy/configuration_policy_loader_win.cc b/chrome/browser/policy/configuration_policy_loader_win.cc index 9677d8a..dfc10d8 100644 --- a/chrome/browser/policy/configuration_policy_loader_win.cc +++ b/chrome/browser/policy/configuration_policy_loader_win.cc @@ -6,7 +6,7 @@ #include <userenv.h> -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // userenv.dll is required for RegisterGPNotification(). #pragma comment(lib, "userenv.lib") diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index ee8f280..aee5d88 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -17,7 +17,7 @@ #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/prefs/pref_value_map.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "policy/policy_constants.h" namespace policy { diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index 7c04ffa..62f264e 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/policy/configuration_policy_provider_win.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -159,8 +159,8 @@ class ConfigurationPolicyProviderWinTest MessageLoop loop_; private: - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; // Keys are created for the lifetime of a test to contain // the sandboxed HKCU and HKLM hives, respectively. diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index ede9949..1bd6e83 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -11,7 +11,7 @@ #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/policy/device_management_backend.h" #include "chrome/browser/policy/device_management_backend_impl.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/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc index 7825be4..df5e3bc3 100644 --- a/chrome/browser/policy/device_management_service_unittest.cc +++ b/chrome/browser/policy/device_management_service_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/proto/device_management_constants.h" #include "chrome/test/base/testing_browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "net/base/escape.h" #include "net/base/load_flags.h" @@ -79,8 +79,8 @@ class DeviceManagementServiceTestBase : public TESTBASE { private: MessageLoopForUI loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; struct FailedRequestParams { diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc index e3c8741..562ae68 100644 --- a/chrome/browser/policy/device_token_fetcher_unittest.cc +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/policy/mock_device_management_service.h" #include "chrome/browser/policy/policy_notifier.h" #include "chrome/browser/policy/user_policy_cache.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" @@ -64,8 +64,8 @@ class DeviceTokenFetcherTest : public testing::Test { ScopedTempDir temp_user_data_dir_; private: - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; TEST_F(DeviceTokenFetcherTest, FetchToken) { diff --git a/chrome/browser/policy/enterprise_metrics_browsertest.cc b/chrome/browser/policy/enterprise_metrics_browsertest.cc index e240aae..dd968fb 100644 --- a/chrome/browser/policy/enterprise_metrics_browsertest.cc +++ b/chrome/browser/policy/enterprise_metrics_browsertest.cc @@ -22,7 +22,7 @@ #include "chrome/browser/policy/proto/device_management_local.pb.h" #include "chrome/browser/policy/user_policy_cache.h" #include "chrome/browser/policy/user_policy_token_cache.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -222,8 +222,8 @@ class EnterpriseMetricsTest : public testing::Test { // test in a separate process. base::StatisticsRecorder statistics_recorder_; MessageLoop loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; // |metric_name_| is the UMA counter that is being tested. It must be set // before any calls to ExpectSample or CheckSamples. std::string metric_name_; diff --git a/chrome/browser/policy/file_based_policy_loader.cc b/chrome/browser/policy/file_based_policy_loader.cc index 46d0439..7f9a0ae 100644 --- a/chrome/browser/policy/file_based_policy_loader.cc +++ b/chrome/browser/policy/file_based_policy_loader.cc @@ -7,7 +7,7 @@ #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/values.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" using ::base::files::FilePathWatcher; diff --git a/chrome/browser/policy/logging_work_scheduler.cc b/chrome/browser/policy/logging_work_scheduler.cc index c4606b7..6947172 100644 --- a/chrome/browser/policy/logging_work_scheduler.cc +++ b/chrome/browser/policy/logging_work_scheduler.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace policy { diff --git a/chrome/browser/policy/logging_work_scheduler_unittest.cc b/chrome/browser/policy/logging_work_scheduler_unittest.cc index 6656b0f..6406a1c 100644 --- a/chrome/browser/policy/logging_work_scheduler_unittest.cc +++ b/chrome/browser/policy/logging_work_scheduler_unittest.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.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" namespace policy { @@ -67,7 +67,7 @@ class LoggingWorkSchedulerTest : public testing::Test { MessageLoop loop_; private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(LoggingWorkSchedulerTest); }; diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index 44791a5..59a0e13 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_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" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index c3fc68e..24a6d05 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.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" @@ -90,9 +90,9 @@ class URLBlacklistManagerTest : public testing::Test { scoped_ptr<TestingURLBlacklistManager> blacklist_manager_; private: - 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(URLBlacklistManagerTest); }; diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc index 2a376c0..50a3bfc 100644 --- a/chrome/browser/policy/user_policy_cache_unittest.cc +++ b/chrome/browser/policy/user_policy_cache_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/browser/policy/proto/device_management_local.pb.h" #include "chrome/browser/policy/proto/old_generic_format.pb.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" @@ -135,8 +135,8 @@ class UserPolicyCacheTest : public testing::Test { private: ScopedTempDir temp_dir_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; }; TEST_F(UserPolicyCacheTest, DecodePolicy) { diff --git a/chrome/browser/policy/user_policy_disk_cache.cc b/chrome/browser/policy/user_policy_disk_cache.cc index 0a18e54..efb8734 100644 --- a/chrome/browser/policy/user_policy_disk_cache.cc +++ b/chrome/browser/policy/user_policy_disk_cache.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.h" #include "chrome/browser/policy/enterprise_metrics.h" #include "chrome/browser/policy/proto/device_management_local.pb.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/policy/user_policy_token_cache.cc b/chrome/browser/policy/user_policy_token_cache.cc index fd7d9c8..dab3302 100644 --- a/chrome/browser/policy/user_policy_token_cache.cc +++ b/chrome/browser/policy/user_policy_token_cache.cc @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "chrome/browser/policy/enterprise_metrics.h" #include "chrome/browser/policy/proto/device_management_local.pb.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index fa085e8..5775db3 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -31,7 +31,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/values.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" class PrefService; diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc index bb5080b..15c5a21 100644 --- a/chrome/browser/prefs/pref_member_unittest.cc +++ b/chrome/browser/prefs/pref_member_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -240,8 +240,8 @@ TEST(PrefMemberTest, MoveToThread) { scoped_refptr<GetPrefValueCallback> callback = make_scoped_refptr(new GetPrefValueCallback()); 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); ASSERT_TRUE(io_thread.Start()); RegisterTestPrefs(&prefs); callback->Init(kBoolPref, &prefs); diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 3a48b43..5ab4651 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -30,7 +30,7 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/json_pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc index 09fca07..133609f 100644 --- a/chrome/browser/prefs/pref_service_mock_builder.cc +++ b/chrome/browser/prefs/pref_service_mock_builder.cc @@ -10,7 +10,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/json_pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" PrefServiceMockBuilder::PrefServiceMockBuilder() : user_prefs_(new TestingPrefStore) { diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h index 142f906..a9763b8 100644 --- a/chrome/browser/prefs/pref_value_store.h +++ b/chrome/browser/prefs/pref_value_store.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/common/pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" class FilePath; class PrefModelAssociator; diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index f7264ce..0af29b6 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/time.h" -#include "base/values.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/history/top_sites.h" @@ -22,8 +22,8 @@ #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_histograms.h" #include "chrome/browser/prerender/prerender_history.h" -#include "chrome/browser/prerender/prerender_tab_helper.h" #include "chrome/browser/prerender/prerender_manager_factory.h" +#include "chrome/browser/prerender/prerender_tab_helper.h" #include "chrome/browser/prerender/prerender_tracker.h" #include "chrome/browser/prerender/prerender_util.h" #include "chrome/browser/profiles/profile.h" @@ -32,7 +32,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/cancelable_request.h" #include "content/browser/debugger/render_view_devtools_agent_host.h" #include "content/browser/renderer_host/render_process_host.h" @@ -41,6 +40,7 @@ #include "content/browser/tab_contents/render_view_host_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/prerender/prerender_manager_unittest.cc b/chrome/browser/prerender/prerender_manager_unittest.cc index e84fed1..28cf9f0 100644 --- a/chrome/browser/prerender/prerender_manager_unittest.cc +++ b/chrome/browser/prerender/prerender_manager_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_origin.h" #include "chrome/test/base/testing_browser_process.h" -#include "content/browser/browser_thread.h" -#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -201,7 +201,7 @@ class PrerenderManagerTest : public testing::Test { // Needed to pass PrerenderManager's DCHECKs. MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_ptr<TestPrerenderManager> prerender_manager_; }; diff --git a/chrome/browser/prerender/prerender_tracker.cc b/chrome/browser/prerender/prerender_tracker.cc index f8df2ae..893744a 100644 --- a/chrome/browser/prerender/prerender_tracker.cc +++ b/chrome/browser/prerender/prerender_tracker.cc @@ -8,11 +8,11 @@ #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prerender/prerender_manager.h" -#include "content/browser/browser_thread.h" -#include "content/browser/resource_context.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/resource_context.h" #include "content/common/resource_messages.h" +#include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" namespace prerender { diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc index f07fd2b..7399264 100644 --- a/chrome/browser/prerender/prerender_tracker_unittest.cc +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_tracker.h" #include "chrome/test/base/testing_browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace prerender { @@ -70,8 +70,8 @@ class PrerenderTrackerTest : public testing::Test { private: MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<TestPrerenderManager> prerender_manager_; }; diff --git a/chrome/browser/printing/background_printing_manager.cc b/chrome/browser/printing/background_printing_manager.cc index 1b1e4e5..d81c15f 100644 --- a/chrome/browser/printing/background_printing_manager.cc +++ b/chrome/browser/printing/background_printing_manager.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.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/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index 2e7e7cd..325a030 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -22,7 +22,7 @@ #include "chrome/common/cloud_print/cloud_print_proxy_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index 7594723..6e332f4 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -27,9 +27,9 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index aeb368a..4d1db8f 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -25,11 +25,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index 83c278e..be77910 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -21,11 +21,11 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/test/test_browser_thread.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_test_job.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 6158560..463ae7a 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -19,10 +19,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_details.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" #include "testing/gtest/include/gtest/gtest.h" @@ -233,8 +233,8 @@ class CloudPrintDataSenderTest : public testing::Test { scoped_ptr<MockCloudPrintDataSenderHelper> mock_helper_; MessageLoop message_loop_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; }; // TODO(scottbyer): DISABLED until the binary test file can get @@ -320,7 +320,7 @@ class CloudPrintHtmlDialogDelegateTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; base::WeakPtr<MockCloudPrintFlowHandler> mock_flow_handler_; scoped_ptr<CloudPrintHtmlDialogDelegate> delegate_; }; diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h index a1e1b35..7b95255 100644 --- a/chrome/browser/printing/print_dialog_gtk.h +++ b/chrome/browser/printing/print_dialog_gtk.h @@ -13,7 +13,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "printing/print_dialog_gtk_interface.h" #include "printing/printing_context_cairo.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 7616aea6..4311680 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_job.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 "printing/print_job_constants.h" #include "printing/printed_document.h" diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc index 74e5b1d..55348f6 100644 --- a/chrome/browser/printing/print_preview_message_handler.cc +++ b/chrome/browser/printing/print_preview_message_handler.cc @@ -19,10 +19,10 @@ #include "chrome/browser/ui/webui/print_preview_handler.h" #include "chrome/browser/ui/webui/print_preview_ui.h" #include "chrome/common/print_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/content_restriction.h" +#include "content/public/browser/browser_thread.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" diff --git a/chrome/browser/printing/print_system_task_proxy.h b/chrome/browser/printing/print_system_task_proxy.h index 8d5b00c..5158754 100644 --- a/chrome/browser/printing/print_system_task_proxy.h +++ b/chrome/browser/printing/print_system_task_proxy.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "chrome/browser/ui/webui/print_preview_handler.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/printing/printer_manager_dialog_linux.cc b/chrome/browser/printing/printer_manager_dialog_linux.cc index 031d1e9..c38e578 100644 --- a/chrome/browser/printing/printer_manager_dialog_linux.cc +++ b/chrome/browser/printing/printer_manager_dialog_linux.cc @@ -7,8 +7,8 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" -#include "content/browser/browser_thread.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" using base::Environment; diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index cd6ccdb..38d012e 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -70,9 +70,9 @@ #include "base/rand_util.h" #include "base/safe_strerror_posix.h" #include "base/stl_util.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time.h" @@ -89,7 +89,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 4db0ebe..5848271 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -45,13 +45,13 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/host_zoom_map.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/ssl/ssl_host_state.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/transport_security_state.h" #include "net/http/http_server_properties.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 1d27f0c..4fb8e2d 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -17,8 +17,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/resource_context.h" +#include "content/public/browser/browser_thread.h" #include "net/base/default_origin_bound_cert_store.h" #include "net/base/origin_bound_cert_service.h" #include "net/ftp/ftp_network_layer.h" diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index b55c59c..f6c93d4 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -45,7 +45,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/download/download_manager.h" #include "content/browser/file_system/browser_file_system_helper.h" @@ -54,6 +53,7 @@ #include "content/browser/ssl/ssl_host_state.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/browser_thread.h" #include "grit/locale_settings.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/database/database_tracker.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 592aa8c..0b29d67 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -93,7 +93,6 @@ #include "chrome/common/render_messages.h" #include "chrome/common/spellcheck_messages.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/host_zoom_map.h" @@ -102,6 +101,7 @@ #include "content/browser/speech/speech_input_manager.h" #include "content/browser/ssl/ssl_host_state.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 60807ac..efff4da 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -23,8 +23,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/resource_context.h" +#include "content/public/browser/browser_thread.h" #include "net/base/origin_bound_cert_service.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index af74542..645ff4b 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -41,13 +41,13 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/host_zoom_map.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/resource_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "net/base/origin_bound_cert_service.h" #include "net/http/http_transaction_factory.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 42d9b51..f6486a8 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -26,14 +26,14 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/sync_promo_ui.h" -#include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "net/http/http_transaction_factory.h" diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 76cd7e8..53d7269 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -26,8 +26,8 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.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" @@ -83,9 +83,9 @@ class ProfileManagerTest : public testing::Test { extension_event_router_forwarder_; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread file_thread_; IOThread io_thread_; scoped_ptr<base::SystemMonitor> system_monitor_dummy_; diff --git a/chrome/browser/protector/protector.cc b/chrome/browser/protector/protector.cc index f3acaca..e26fe18 100644 --- a/chrome/browser/protector/protector.cc +++ b/chrome/browser/protector/protector.cc @@ -12,7 +12,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.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" #include "crypto/hmac.h" diff --git a/chrome/browser/protector/settings_change_global_error.cc b/chrome/browser/protector/settings_change_global_error.cc index d8e161c..97b72ad 100644 --- a/chrome/browser/protector/settings_change_global_error.cc +++ b/chrome/browser/protector/settings_change_global_error.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/global_error_service.h" #include "chrome/browser/ui/global_error_service_factory.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index 8851a10..c8727a0 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -25,14 +25,14 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/render_messages.h" -#include "content/browser/browser_thread.h" -#include "content/browser/resource_context.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/renderer_host/resource_message_filter.h" -#include "content/public/browser/notification_service.h" +#include "content/browser/resource_context.h" #include "content/common/resource_messages.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/browser/notification_service.h" #include "net/base/load_flags.h" // TODO(oshima): Enable this for other platforms. diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc index 931731a..fa6ec43 100644 --- a/chrome/browser/renderer_host/offline_resource_handler.cc +++ b/chrome/browser/renderer_host/offline_resource_handler.cc @@ -15,10 +15,10 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/url_constants.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.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 "net/base/net_errors.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/renderer_host/web_cache_manager_unittest.cc b/chrome/browser/renderer_host/web_cache_manager_unittest.cc index 11b5b13..5f59017 100644 --- a/chrome/browser/renderer_host/web_cache_manager_unittest.cc +++ b/chrome/browser/renderer_host/web_cache_manager_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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,7 +6,7 @@ #include "base/message_loop.h" #include "chrome/browser/renderer_host/web_cache_manager.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -93,7 +93,7 @@ class WebCacheManagerTest : public testing::Test { private: WebCacheManager manager_; MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; // static diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index dcde8bb..c89137d 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -8,8 +8,8 @@ #include "chrome/browser/rlz/rlz.h" -#include <process.h> #include <windows.h> +#include <process.h> #include <algorithm> @@ -31,8 +31,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" #include "chrome/installer/util/google_update_settings.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" namespace { diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 7663551..a5e2e6b 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -14,15 +14,15 @@ #include "base/stringprintf.h" #include "base/task.h" #include "base/time.h" -#include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/browser_features.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" -#include "content/browser/browser_thread.h" +#include "chrome/common/safe_browsing/csd.pb.h" #include "content/browser/cancelable_request.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/page_transition_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index cd87e65..8e0309e 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -12,19 +12,19 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/time.h" -#include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/browser_features.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" +#include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/common/view_messages.h" #include "content/public/common/page_transition_types.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" @@ -133,7 +133,7 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness { } } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; int num_pending_; scoped_ptr<BrowserFeatureExtractor> extractor_; std::map<ClientPhishingRequest*, bool> success_; diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 3de105a..dfcce12 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -21,7 +21,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -29,9 +28,10 @@ #include "content/browser/renderer_host/resource_request_details.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" -#include "content/common/view_messages.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 90f8028..b611524 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -16,9 +16,9 @@ #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" @@ -149,10 +149,11 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness { mock_profile_ = new NiceMock<MockTestingProfile>(); browser_context_.reset(mock_profile_); - ui_thread_.reset(new BrowserThread(BrowserThread::UI, &message_loop_)); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + &message_loop_)); // Note: we're starting a real IO thread to make sure our DCHECKs that // verify which thread is running are actually tested. - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); ASSERT_TRUE(io_thread_->Start()); TabContentsWrapperTestHarness::SetUp(); @@ -289,8 +290,8 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness { MockTestingProfile* mock_profile_; // We don't own this object private: - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; }; TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneInvalidVerdict) { diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index ace424f..3c3e54a 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -6,14 +6,14 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/time.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" #include "base/stl_util.h" +#include "base/string_util.h" #include "base/task.h" #include "base/time.h" +#include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -23,8 +23,8 @@ #include "chrome/common/safe_browsing/client_model.pb.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/url_fetcher.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 67d7b63..4faf19c 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/common/safe_browsing/client_model.pb.h" #include "chrome/common/safe_browsing/csd.pb.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" @@ -61,11 +61,13 @@ ACTION(QuitCurrentMessageLoop) { class ClientSideDetectionServiceTest : public testing::Test { protected: virtual void SetUp() { - file_thread_.reset(new BrowserThread(BrowserThread::FILE, &msg_loop_)); + file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE, + &msg_loop_)); factory_.reset(new FakeURLFetcherFactory()); - browser_thread_.reset(new BrowserThread(BrowserThread::UI, &msg_loop_)); + browser_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + &msg_loop_)); } virtual void TearDown() { @@ -188,8 +190,8 @@ class ClientSideDetectionServiceTest : public testing::Test { msg_loop_.Quit(); } - scoped_ptr<BrowserThread> browser_thread_; - scoped_ptr<BrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> browser_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; GURL phishing_url_; bool is_phishing_; diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 668290b..251b87217 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -13,8 +13,8 @@ #include "chrome/browser/safe_browsing/signature_util.h" #include "chrome/common/net/http_return.h" #include "chrome/common/safe_browsing/csd.pb.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_item.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index ff2cc23..f505441 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -13,11 +13,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_item.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 "testing/gmock/include/gmock/gmock.h" @@ -43,12 +44,13 @@ class MockSafeBrowsingService : public SafeBrowsingService { class DownloadProtectionServiceTest : public testing::Test { protected: virtual void SetUp() { - ui_thread_.reset(new BrowserThread(BrowserThread::UI, &msg_loop_)); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + &msg_loop_)); // Start real threads for the IO and File threads so that the DCHECKs // to test that we're on the correct thread work. - io_thread_.reset(new BrowserThread(BrowserThread::IO)); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); ASSERT_TRUE(io_thread_->Start()); - file_thread_.reset(new BrowserThread(BrowserThread::FILE)); + file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE)); ASSERT_TRUE(file_thread_->Start()); sb_service_ = new MockSafeBrowsingService(); download_service_ = sb_service_->download_protection_service(); @@ -135,9 +137,9 @@ class DownloadProtectionServiceTest : public testing::Test { DownloadProtectionService* download_service_; MessageLoop msg_loop_; DownloadProtectionService::DownloadCheckResult result_; - scoped_ptr<BrowserThread> io_thread_; - scoped_ptr<BrowserThread> file_thread_; - scoped_ptr<BrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; }; TEST_F(DownloadProtectionServiceTest, CheckClientDownloadInvalidUrl) { diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc index 09a7304..cc54b7b 100644 --- a/chrome/browser/safe_browsing/malware_details.cc +++ b/chrome/browser/safe_browsing/malware_details.cc @@ -15,10 +15,10 @@ #include "chrome/browser/safe_browsing/report.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/disk_cache/disk_cache.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/safe_browsing/malware_details.h b/chrome/browser/safe_browsing/malware_details.h index 2f49df3..b122443 100644 --- a/chrome/browser/safe_browsing/malware_details.h +++ b/chrome/browser/safe_browsing/malware_details.h @@ -21,8 +21,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/safe_browsing/report.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents_observer.h" +#include "content/public/browser/browser_thread.h" #include "net/base/completion_callback.h" class TabContents; diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc index ced572a..93f5831 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.cc +++ b/chrome/browser/safe_browsing/malware_details_cache.cc @@ -14,7 +14,7 @@ #include "chrome/browser/safe_browsing/malware_details_cache.h" #include "chrome/browser/safe_browsing/report.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/url_fetcher.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.cc b/chrome/browser/safe_browsing/malware_details_history.cc index 6cfd1db..c0cf3db 100644 --- a/chrome/browser/safe_browsing/malware_details_history.cc +++ b/chrome/browser/safe_browsing/malware_details_history.cc @@ -11,10 +11,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h index 9da1c02..b0eafb7 100644 --- a/chrome/browser/safe_browsing/malware_details_history.h +++ b/chrome/browser/safe_browsing/malware_details_history.h @@ -16,7 +16,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "chrome/browser/history/history.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 "net/base/completion_callback.h" diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index 807d9fe..dc9580c 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/test_url_request_context_getter.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "net/disk_cache/disk_cache.h" @@ -304,8 +304,8 @@ class MalwareDetailsTest : public ChromeRenderViewHostTestHarness { *redirects, history::SOURCE_BROWSED, false); } - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<MockSafeBrowsingService> sb_service_; }; diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index f68dd00..ac4ca9d 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -20,7 +20,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.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/base/load_flags.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 4cb3b12..f461908 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -27,11 +27,11 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 12b32b9..faf09c0 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -12,19 +12,19 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/malware_details.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/test/test_browser_thread.h" // A SafeBrowingService class that allows us to inject the malicious URLs. class FakeSafeBrowsingService : public SafeBrowsingService { diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 4367305..e2115f5 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -9,10 +9,10 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/common/view_messages.h" +#include "content/test/test_browser_thread.h" static const char* kGoogleURL = "http://www.google.com/"; static const char* kGoodURL = "http://www.goodguys.com/"; @@ -175,8 +175,8 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness, UserResponse user_response_; TestSafeBrowsingBlockingPageFactory factory_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; // Tests showing a blocking page for a malware page and not proceeding. diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index e5ac9ea..fcd6b6b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -9,16 +9,16 @@ #include "base/bind.h" #include "base/file_util.h" +#include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" -#include "base/time.h" -#include "base/message_loop.h" #include "base/process_util.h" -#include "crypto/sha2.h" +#include "base/time.h" #include "chrome/browser/safe_browsing/bloom_filter.h" #include "chrome/browser/safe_browsing/prefix_set.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" +#include "crypto/sha2.h" #include "googleurl/src/gurl.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index 088701b..17451e1 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" #include "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "sql/connection.h" @@ -1236,7 +1236,7 @@ TEST_F(SafeBrowsingDatabaseTest, Whitelists) { MessageLoop loop(MessageLoop::TYPE_DEFAULT); // We expect all calls to ContainsCsdWhitelistedUrl in particular to be made // from the IO thread. In general the whitelist lookups are thread-safe. - BrowserThread io_thread(BrowserThread::IO, &loop); + content::TestBrowserThread io_thread(BrowserThread::IO, &loop); // If the whitelist is disabled everything should match the whitelist. database_.reset(new SafeBrowsingDatabaseNew(new SafeBrowsingStoreFile(), diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 8987512..3f99699 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -31,6 +31,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 43a1c36..65a818f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -23,7 +23,7 @@ #include "base/task.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.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 "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 72989fb..17bb343 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -10,25 +10,25 @@ #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" #include "base/scoped_temp_dir.h" -#include "crypto/sha2.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" +#include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" -#include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/test/test_browser_thread.h" +#include "crypto/sha2.h" #include "testing/gmock/include/gmock/gmock.h" using base::Histogram; diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 171b7b3..3252d8c 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -21,9 +21,9 @@ #include "base/environment.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/stringprintf.h" #include "base/synchronization/lock.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" @@ -37,10 +37,10 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" +#include "content/test/test_browser_thread.h" #include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_log.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index 4682b2a..d0ddfd8 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -17,7 +17,7 @@ #include "chrome/browser/search_engines/util.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_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index fb12aad..66bc630 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -17,9 +17,9 @@ #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/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" // Create a TemplateURL. The caller owns the returned TemplateURL*. diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index 3f99aa1..a0ab0ff 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/instant/instant_field_trial.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index 45e5206..d980428 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc @@ -14,6 +14,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" namespace { @@ -74,8 +75,8 @@ class TemplateURLServiceTestingProfile : public TestingProfile { private: scoped_refptr<WebDataService> service_; ScopedTempDir temp_dir_; - BrowserThread db_thread_; - BrowserThread io_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread io_thread_; }; // Trivial subclass of TemplateURLService that records the last invocation of diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h index 606cfd1..ae90b0c 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.h +++ b/chrome/browser/search_engines/template_url_service_test_util.h @@ -15,7 +15,7 @@ #include "base/string16.h" #include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/test/base/testing_browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" class TemplateURLService; class TemplateURLServiceTestingProfile; @@ -93,7 +93,7 @@ class TemplateURLServiceTestUtil : public TemplateURLServiceObserver { MessageLoopForUI message_loop_; // Needed to make the DeleteOnUIThread trait of WebDataService work // properly. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_ptr<TemplateURLServiceTestingProfile> profile_; scoped_ptr<TestingTemplateURLService> model_; int changed_count_; diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index 6eeada95..0d0bb96c 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" -#include "base/test/mock_time_provider.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/test/mock_time_provider.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" @@ -17,17 +17,17 @@ #include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" -#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_notification_types.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/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc index f2b8512..893c23c 100644 --- a/chrome/browser/search_engines/util.cc +++ b/chrome/browser/search_engines/util.cc @@ -8,13 +8,13 @@ #include <vector> #include "base/logging.h" +#include "chrome/browser/prefs/pref_service.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/search_engines/template_url_prepopulate_data.h" -#include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/profiles/profile.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" string16 GetDefaultSearchEngineName(Profile* profile) { if (!profile) { diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 9ee7fde..cde6166 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -12,12 +12,12 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/upgrade_detector.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/service_messages.h" #include "chrome/common/service_process_util.h" -#include "content/browser/browser_thread.h" #include "content/common/child_process_host.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/browser/service/service_process_control_mac.mm b/chrome/browser/service/service_process_control_mac.mm index 2d15bac..d11acaa 100644 --- a/chrome/browser/service/service_process_control_mac.mm +++ b/chrome/browser/service/service_process_control_mac.mm @@ -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. @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/mac/scoped_cftyperef.h" #include "chrome/common/service_process_util_posix.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "third_party/GTM/Foundation/GTMServiceManagement.h" void ServiceProcessControl::Launcher::DoRun() { diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 166d337..bcd5d6f 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -13,7 +13,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" bool ShellIntegration::CanSetAsDefaultProtocolClient() { // Allowed as long as the browser can become the operating system default diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 2dfc1f4..f6787fb 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -34,7 +34,7 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 02fd70e..bc4b687 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths_internal.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" @@ -78,7 +78,7 @@ TEST(ShellIntegrationTest, GetDesktopShortcutTemplate) { const char kTestData2[] = "a different testing string"; MessageLoop message_loop; - BrowserThread file_thread(BrowserThread::FILE, &message_loop); + content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop); { ScopedTempDir temp_dir; diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 25f868a..152fd72 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -34,7 +34,7 @@ #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/work_item.h" #include "chrome/installer/util/work_item_list.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/speech/chrome_speech_input_manager.cc b/chrome/browser/speech/chrome_speech_input_manager.cc index 5a838e6..709bc75 100644 --- a/chrome/browser/speech/chrome_speech_input_manager.cc +++ b/chrome/browser/speech/chrome_speech_input_manager.cc @@ -14,7 +14,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "media/audio/audio_manager.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/speech/chrome_speech_input_preferences.cc b/chrome/browser/speech/chrome_speech_input_preferences.cc index ff88d31..9790a2a 100644 --- a/chrome/browser/speech/chrome_speech_input_preferences.cc +++ b/chrome/browser/speech/chrome_speech_input_preferences.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" ChromeSpeechInputPreferences::ChromeSpeechInputPreferences( PrefService* pref_service) diff --git a/chrome/browser/speech/speech_input_bubble_controller.cc b/chrome/browser/speech/speech_input_bubble_controller.cc index 1ffb393..59fa67c 100644 --- a/chrome/browser/speech/speech_input_bubble_controller.cc +++ b/chrome/browser/speech/speech_input_bubble_controller.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc index cd8b841..66ef2d7 100644 --- a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc +++ b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/browser_with_test_window_test.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" #include "ui/gfx/rect.h" @@ -153,7 +153,7 @@ class SpeechInputBubbleControllerTest protected: // The main thread of the test is marked as the IO thread and we create a new // one for the UI thread. - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; bool cancel_clicked_; bool try_again_clicked_; bool focus_changed_; diff --git a/chrome/browser/spellchecker/spellcheck_host.h b/chrome/browser/spellchecker/spellcheck_host.h index ef08f34..04272ac 100644 --- a/chrome/browser/spellchecker/spellcheck_host.h +++ b/chrome/browser/spellchecker/spellcheck_host.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace base { class WaitableEvent; diff --git a/chrome/browser/spellchecker/spellcheck_profile_unittest.cc b/chrome/browser/spellchecker/spellcheck_profile_unittest.cc index 854e26ff..7efabd1 100644 --- a/chrome/browser/spellchecker/spellcheck_profile_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_profile_unittest.cc @@ -7,7 +7,7 @@ #include "base/scoped_temp_dir.h" #include "chrome/browser/spellchecker/spellcheck_host.h" #include "chrome/browser/spellchecker/spellcheck_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" @@ -72,7 +72,7 @@ class SpellCheckProfileTest : public testing::Test { } // SpellCheckHost will be deleted on FILE thread. - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; }; TEST_F(SpellCheckProfileTest, ReinitializeEnabled) { diff --git a/chrome/browser/spellchecker/spellchecker_mac.mm b/chrome/browser/spellchecker/spellchecker_mac.mm index a9dcc73..5b0db7c 100644 --- a/chrome/browser/spellchecker/spellchecker_mac.mm +++ b/chrome/browser/spellchecker/spellchecker_mac.mm @@ -11,13 +11,13 @@ #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/sys_string_conversions.h" #include "base/task.h" #include "base/time.h" -#include "base/sys_string_conversions.h" #include "chrome/common/spellcheck_common.h" #include "chrome/common/spellcheck_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/browser_message_filter.h" +#include "content/public/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult.h" using base::TimeTicks; diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc index 4b62688..d83aea4 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler.cc +++ b/chrome/browser/ssl/ssl_add_cert_handler.cc @@ -8,9 +8,9 @@ #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/public/browser/browser_thread.h" #include "net/base/cert_database.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" 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) { diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index bc2f9b6..ce771b6 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -14,7 +14,6 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/site_instance.h" @@ -22,11 +21,12 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/common/content_constants.h" +#include "content/common/view_messages.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" -#include "content/common/view_messages.h" #include "content/public/browser/notification_source.h" #include "content/public/common/bindings_policy.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/message_box_flags.h" #include "webkit/glue/webkit_glue.h" @@ -199,7 +199,7 @@ class TabContentsTest : public ChromeRenderViewHostTestHarness { Value::CreateStringValue("bar")); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; // Test to make sure that title updates get stripped of whitespace. diff --git a/chrome/browser/tab_contents/web_drag_source_win.cc b/chrome/browser/tab_contents/web_drag_source_win.cc index d38adb7..7a08a3b 100644 --- a/chrome/browser/tab_contents/web_drag_source_win.cc +++ b/chrome/browser/tab_contents/web_drag_source_win.cc @@ -6,9 +6,9 @@ #include "base/task.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 5366586..f8d6a45 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -28,7 +28,6 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" @@ -38,6 +37,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/test/notification_observer_mock.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using testing::_; @@ -260,7 +260,7 @@ class TabStripModelTest : public ChromeRenderViewHostTestHarness { return &accessor; } - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; std::wstring test_dir_; std::wstring profile_path_; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 7b7cad2..9668132 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -23,14 +23,14 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/common/chrome_view_types.h" #include "chrome/common/pref_names.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_process_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index ad28bd5..136115b 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -35,16 +35,16 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/chrome_view_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/render_messages.h" -#include "chrome/common/chrome_view_types.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_message_filter.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 "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index d050ebe..785d73c 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -12,7 +12,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/themes/theme_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index fb748e9..e46dc1d 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/gfx/color_utils.h" class FilePath; diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 91a84c4..6251a73 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -13,7 +13,7 @@ #include "base/values.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" @@ -192,8 +192,8 @@ class BrowserThemePackTest : public ::testing::Test { } MessageLoop message_loop; - BrowserThread fake_ui_thread; - BrowserThread fake_file_thread; + content::TestBrowserThread fake_ui_thread; + content::TestBrowserThread fake_file_thread; scoped_refptr<BrowserThemePack> theme_pack_; }; diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 9cc126b..36ee9fc 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -7,8 +7,8 @@ #include <set> #include <vector> -#include "base/utf_string_conversions.h" #include "base/stringprintf.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" @@ -18,14 +18,13 @@ #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/browser/translate/translate_prefs.h" -#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/test_tab_contents.h" @@ -33,6 +32,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/test/notification_observer_mock.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" @@ -238,7 +238,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, private: content::NotificationRegistrar notification_registrar_; TestURLFetcherFactory url_fetcher_factory_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // The infobars that have been removed. // WARNING: the pointers point to deleted objects, use only for comparison. diff --git a/chrome/browser/transport_security_persister.cc b/chrome/browser/transport_security_persister.cc index 21c3e2b..141a89d 100644 --- a/chrome/browser/transport_security_persister.cc +++ b/chrome/browser/transport_security_persister.cc @@ -10,7 +10,7 @@ #include "base/message_loop.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" #include "net/base/transport_security_state.h" class TransportSecurityPersister::Loader { diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 0b4e3a2..6d1aa8d 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -14,18 +14,18 @@ #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/signin_manager.h" +#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 7e703ef..9ca04f9a 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -31,8 +31,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/net/crl_set_fetcher.h" #include "chrome/browser/infobars/infobar_tab_helper.h" +#include "chrome/browser/net/crl_set_fetcher.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -69,11 +69,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/browser_distribution.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h index 5c50c7c..7fe4a7d 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.h +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/browser.h" +#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" -#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" // Base class which contains a valid Browser*. Lots of boilerplate to // recycle between unit test classes. @@ -58,14 +58,14 @@ class CocoaProfileTest : public CocoaTest { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; TestingProfileManager profile_manager_; TestingProfile* profile_; // Weak; owned by profile_manager_. scoped_ptr<Browser> browser_; - scoped_ptr<BrowserThread> file_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> file_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; }; #endif // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_ diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index d816f40..46f85d5 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -6,13 +6,16 @@ #include "chrome/browser/browser_process.h" #include "chrome/test/base/testing_browser_process.h" +#include "content/test/test_browser_thread.h" CocoaProfileTest::CocoaProfileTest() : ui_thread_(BrowserThread::UI, &message_loop_), profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), profile_(NULL), - file_thread_(new BrowserThread(BrowserThread::FILE, &message_loop_)), - io_thread_(new BrowserThread(BrowserThread::IO, &message_loop_)) { + file_thread_(new content::TestBrowserThread(BrowserThread::FILE, + &message_loop_)), + io_thread_(new content::TestBrowserThread(BrowserThread::IO, + &message_loop_)) { } CocoaProfileTest::~CocoaProfileTest() { diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index a9e4136..e5aa259 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm @@ -10,6 +10,7 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "chrome/test/base/testing_profile.h" namespace { @@ -22,7 +23,7 @@ class CollectedCookiesWindowControllerTest } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(CollectedCookiesWindowControllerTest, Construction) { diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 823b450..6a5fb86 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -14,7 +14,7 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/content_settings_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -39,7 +39,7 @@ class ContentSettingBubbleControllerTest virtual ~ContentSettingBubbleControllerTest(); private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; base::mac::ScopedNSAutoreleasePool pool_; }; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index cb40b3b..1461429 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -12,6 +12,7 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" // Subclass balloon controller and mock out the initialization of the RVH. @interface TestBalloonController : BalloonController { @@ -68,8 +69,8 @@ class BalloonControllerTest : public ChromeRenderViewHostTestHarness { } protected: - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_ptr<Browser> browser_; scoped_ptr<BalloonCollection> collection_; }; diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index a095e3f..cb44475 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -16,9 +16,9 @@ #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc index 9931718..9e64185 100644 --- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc +++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "content/browser/browser_thread.h" class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness { public: @@ -17,7 +17,7 @@ class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness { } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; class ConstrainedWindowCloseTest : public ConstrainedWindow { diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 67f9af9..33ce546 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness { @@ -41,7 +41,7 @@ class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness { EXPECT_FALSE(bubble_content.manage_link.empty()); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(ContentSettingBubbleModelTest, ImageRadios) { diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index e2c50a9..2709148 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "net/base/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,7 +22,7 @@ class ContentSettingImageModelTest : public TabContentsWrapperTestHarness { : ui_thread_(BrowserThread::UI, &message_loop_) {} private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(ContentSettingImageModelTest); }; diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index a45913f..6c4bf5a 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index ad61231..a5b0fd7 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" class FindBackendTest : public TabContentsWrapperTestHarness { public: @@ -21,7 +21,7 @@ class FindBackendTest : public TabContentsWrapperTestHarness { browser_thread_(BrowserThread::UI, &message_loop_) {} private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; }; namespace { diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc index 226cabf..1567f93 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" // Dummy implementation that's good enough for the tests; we don't test @@ -50,8 +50,8 @@ class BookmarkBarGtkUnittest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<Browser> browser_; diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc index 7563edd..8316d3d 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -47,8 +47,8 @@ class BookmarkEditorGtkTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; BookmarkModel* model_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc index bd9cf29..0b2aa84 100644 --- a/chrome/browser/ui/gtk/certificate_dialogs.cc +++ b/chrome/browser/ui/gtk/certificate_dialogs.cc @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/task.h" #include "chrome/common/net/x509_certificate_model.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 0b8a1fc2..56a5a85 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/gtk/gtk_hig_constants.h" #if defined(TOUCH_UI) diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index f7eee4b..a1dbe87 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -16,9 +16,9 @@ #include "chrome/browser/ui/webui/extension_icon_source.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index f10dfaa..12eaffc 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/shell_integration.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc index b189436..bdfe27a 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc @@ -10,9 +10,9 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" -#include "crypto/crypto_module_blocking_password_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" +#include "crypto/crypto_module_blocking_password_delegate.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/dialogs_common.cc b/chrome/browser/ui/gtk/dialogs_common.cc index 1f0688b..f792f0c 100644 --- a/chrome/browser/ui/gtk/dialogs_common.cc +++ b/chrome/browser/ui/gtk/dialogs_common.cc @@ -12,7 +12,7 @@ #include "base/nix/xdg_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" FilePath* SelectFileDialogImpl::last_saved_path_ = NULL; FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc index bbb412b..6064705 100644 --- a/chrome/browser/ui/gtk/dialogs_gtk.cc +++ b/chrome/browser/ui/gtk/dialogs_gtk.cc @@ -16,7 +16,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/dialogs_common.h" #include "chrome/browser/ui/shell_dialogs.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc index a86502e..9781df8 100644 --- a/chrome/browser/ui/gtk/dialogs_kde.cc +++ b/chrome/browser/ui/gtk/dialogs_kde.cc @@ -23,7 +23,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/dialogs_common.h" #include "chrome/browser/ui/shell_dialogs.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc index 7ff26f8..db4e838 100644 --- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc @@ -7,9 +7,9 @@ #include "base/message_loop.h" #include "chrome/browser/repost_form_warning_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index a1995a9..8a07c1c 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -19,9 +19,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/net/x509_certificate_model.h" -#include "content/browser/browser_thread.h" #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc index 9d82dba..ac487be 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc @@ -20,9 +20,9 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/gfx/codec/png_codec.h" #include "webkit/glue/web_intent_service_data.h" @@ -193,8 +193,8 @@ class WebIntentPickerControllerTest : public TabContentsWrapperTestHarness { MessageLoop::current()->Run(); } - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; WebIntentPickerMock picker_; // |controller_| takes ownership. diff --git a/chrome/browser/ui/intents/web_intents_model_unittest.cc b/chrome/browser/ui/intents/web_intents_model_unittest.cc index 75923d2..bf1fc15 100644 --- a/chrome/browser/ui/intents/web_intents_model_unittest.cc +++ b/chrome/browser/ui/intents/web_intents_model_unittest.cc @@ -5,11 +5,12 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" #include "base/synchronization/waitable_event.h" -#include "base/values.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/intents/web_intents_registry.h" -#include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/ui/intents/web_intents_model.h" +#include "chrome/browser/webdata/web_data_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/tree_node_model.h" @@ -66,8 +67,8 @@ class WebIntentsModelTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; scoped_refptr<WebDataService> wds_; WebIntentsRegistry registry_; ScopedTempDir temp_dir_; diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 0e5135e..4ed400f 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -14,13 +14,13 @@ #include "chrome/browser/ui/constrained_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "net/base/auth.h" diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 15180c4..972d9d2 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -14,10 +14,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "net/base/auth.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc index 97a546d..794ddaa 100644 --- a/chrome/browser/ui/login/login_prompt_gtk.cc +++ b/chrome/browser/ui/login/login_prompt_gtk.cc @@ -14,11 +14,11 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/login/login_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index 99868e0..071e5ac 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -14,10 +14,10 @@ #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/login/login_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index a112a00..c1d8dbb 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -10,11 +10,11 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/browser/ui/views/login_view.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/shell_dialogs_unittest.cc b/chrome/browser/ui/shell_dialogs_unittest.cc index 8656485..0344dfc 100644 --- a/chrome/browser/ui/shell_dialogs_unittest.cc +++ b/chrome/browser/ui/shell_dialogs_unittest.cc @@ -7,13 +7,14 @@ #include "base/string16.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/browser_prefs.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" -#include "chrome/common/pref_names.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class FileSelectionUser : public SelectFileDialog::Listener { @@ -73,7 +74,7 @@ typedef testing::Test FileSelectionDialogTest; // file-selection dialogs disabled by policy. TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) { MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); ScopedTestingLocalState local_state( static_cast<TestingBrowserProcess*>(g_browser_process)); diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index 9267b50..7011399 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -13,11 +13,11 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" @@ -99,7 +99,7 @@ class BackFwdMenuModelTest : public ChromeRenderViewHostTestHarness { contents()->CommitPendingNavigation(); } - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(BackFwdMenuModelTest, BasicCase) { diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc index a3379ad..f521b17 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class EncodingMenuControllerTest : public testing::Test { @@ -20,7 +21,7 @@ class EncodingMenuControllerTest : public testing::Test { : ui_thread_(BrowserThread::UI, &message_loop_) {} private: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(EncodingMenuControllerTest, EncodingIDsBelongTest) { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 7fe3804..0bf9d01 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -23,6 +23,7 @@ #include "chrome/test/base/view_event_test_base.h" #include "content/browser/tab_contents/page_navigator.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" @@ -290,8 +291,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { gfx::Size bb_view_pref_; scoped_ptr<TestingProfile> profile_; scoped_ptr<Browser> browser_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; ViewsDelegateImpl views_delegate_; }; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc index b0f8ea1..c9c842b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc @@ -14,8 +14,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/page_navigator.h" +#include "content/test/test_browser_thread.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" @@ -82,8 +82,8 @@ class BookmarkContextMenuTest : public testing::Test { protected: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; BookmarkModel* model_; TestingPageNavigator navigator_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 9bf17a7..5a0299b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; @@ -88,8 +88,8 @@ class BookmarkEditorViewTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; BookmarkModel* model_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/ui/views/file_manager_dialog.cc b/chrome/browser/ui/views/file_manager_dialog.cc index cea379f..c3dde25 100644 --- a/chrome/browser/ui/views/file_manager_dialog.cc +++ b/chrome/browser/ui/views/file_manager_dialog.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "chrome/browser/ui/views/window.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 6cb981a..80da6ef 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -19,8 +19,8 @@ #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/shell_dialogs_aura.cc b/chrome/browser/ui/views/shell_dialogs_aura.cc index 3e9c0cb..365fb4b 100644 --- a/chrome/browser/ui/views/shell_dialogs_aura.cc +++ b/chrome/browser/ui/views/shell_dialogs_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/shell_dialogs.h" #include "chrome/browser/ui/views/file_manager_dialog.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // static SelectFileDialog* SelectFileDialog::Create(Listener* listener) { diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index 36531b7..1ddb1dd 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index c164409..eb7b08f 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -11,8 +11,8 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/constrained_window_views.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index 8eac87b..d8efac1 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -21,10 +21,10 @@ #include "chrome/browser/tab_contents/web_drop_target_win.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/drag_download_file.h" #include "content/browser/download/drag_download_util.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "net/base/net_util.h" #include "views/drag_utils.h" diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index bc70cb8..70712d9 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -12,11 +12,11 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc index 572df64..7a1b428 100644 --- a/chrome/browser/ui/webui/bug_report_ui.cc +++ b/chrome/browser/ui/webui/bug_report_ui.cc @@ -25,8 +25,8 @@ #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index 35af8b5..408de1d 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -17,7 +17,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/platform_locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index f15bcc7..b7a5881 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -25,7 +25,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/url_util.h" #include "grit/platform_locale_settings.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index c205328..cd73de7 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -20,8 +20,8 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 4ff9ba9..e61afe8 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -18,7 +18,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc index b604707..c13f882 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc @@ -10,8 +10,8 @@ #include "base/task.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_types.h" +#include "content/public/browser/browser_thread.h" namespace imageburner { diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 43dadf3..512a1d9 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -17,8 +17,8 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 0dcb333..a640b0e 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -33,9 +33,9 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index 5cebaa2..b6ad5fe 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -23,8 +23,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index ab9cc7c..ae0da5c 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -20,8 +20,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index 25d11db..86273ab 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -22,8 +22,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 73a821d..e666094 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -12,10 +12,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/devtools_messages.h" +#include "content/public/browser/browser_thread.h" #include "grit/devtools_resources_map.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 5cc861b..c4af116 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -36,7 +36,7 @@ #include "ui/gfx/image/image.h" #if !defined(OS_MACOSX) -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #endif namespace { diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index a1a2c24..d769460 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_data_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/angle/src/common/version.h" diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc index e664786..910f9e4 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media/media_internals_handler.cc @@ -9,9 +9,9 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/media/media_internals_proxy.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" MediaInternalsMessageHandler::MediaInternalsMessageHandler() : proxy_(new MediaInternalsProxy()) {} diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.h b/chrome/browser/ui/webui/media/media_internals_proxy.h index 3159736..6350a3b 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.h +++ b/chrome/browser/ui/webui/media/media_internals_proxy.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "chrome/browser/media/media_internals_observer.h" #include "chrome/browser/net/chrome_net_log.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index 302267b..0e24eee 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -40,7 +40,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc index 86920ae..e4f575f 100644 --- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc @@ -18,8 +18,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/host_cache.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index a73f731..16cb991 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -30,8 +30,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 7cc727b..1353623 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -42,10 +42,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 6ba45e8..88cbb79 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -36,8 +36,8 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index ea94932..e67c2bf 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -13,9 +13,9 @@ #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" // Command used to configure GNOME 2 proxy settings. const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL}; diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 668b3a3..7c7dba4 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -29,8 +29,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 46b42d5..ea89ebe 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -15,9 +15,9 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/gtk/certificate_dialogs.h" -#include "content/browser/browser_thread.h" // for FileAccessProvider #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/browser_thread.h" // for FileAccessProvider #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 00b9ec7..d8fa8b7 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -24,13 +24,12 @@ #include "chrome/browser/ui/webui/options/browser_options_handler.h" #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" #include "chrome/browser/ui/webui/options/content_settings_handler.h" -#include "chrome/browser/ui/webui/options/handler_options_handler.h" #include "chrome/browser/ui/webui/options/cookies_view_handler.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" #include "chrome/browser/ui/webui/options/extension_settings_handler.h" #include "chrome/browser/ui/webui/options/font_settings_handler.h" +#include "chrome/browser/ui/webui/options/handler_options_handler.h" #include "chrome/browser/ui/webui/options/import_data_handler.h" -#include "chrome/browser/ui/webui/options/web_intents_settings_handler.h" #include "chrome/browser/ui/webui/options/language_options_handler.h" #include "chrome/browser/ui/webui/options/manage_profile_handler.h" #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" @@ -39,15 +38,16 @@ #include "chrome/browser/ui/webui/options/personal_options_handler.h" #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" #include "chrome/browser/ui/webui/options/stop_syncing_handler.h" +#include "chrome/browser/ui/webui/options/web_intents_settings_handler.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/user_metrics.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc index 0223677..d859e4c 100644 --- a/chrome/browser/ui/webui/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview_handler.cc @@ -13,10 +13,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/file_util_icu.h" +#include "base/i18n/number_formatting.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" -#include "base/i18n/number_formatting.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" @@ -40,9 +40,9 @@ #include "chrome/browser/ui/webui/print_preview_ui.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/print_messages.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "printing/backend/print_backend.h" #include "printing/metafile.h" #include "printing/metafile_impl.h" diff --git a/chrome/browser/ui/webui/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals_proxy.h index ad43344..7eca9a5 100644 --- a/chrome/browser/ui/webui/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals_proxy.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_manager.h" #include "webkit/quota/quota_types.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 016adc2..0d30a19 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -15,7 +15,7 @@ #include "chrome/common/url_constants.h" #if defined(OS_CHROMEOS) -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #endif static const char kCurrentScreenshotFilename[] = "current"; diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc index 0c66340..442155b 100644 --- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc +++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/profile_mock.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -66,8 +66,8 @@ class SyncInternalsUITestWithService : public ChromeRenderViewHostTestHarness { { // Needed by |test_sync_internals_ui_|'s constructor. The // message loop is provided by ChromeRenderViewHostTestHarness. - BrowserThread ui_thread_(BrowserThread::UI, - MessageLoopForUI::current()); + content::TestBrowserThread ui_thread_(BrowserThread::UI, + MessageLoopForUI::current()); // |test_sync_internals_ui_|'s constructor triggers all the // expectations above. test_sync_internals_ui_.reset(new TestSyncInternalsUI(contents())); @@ -142,8 +142,8 @@ class SyncInternalsUITestWithoutService { // Needed by |test_sync_internals_ui_|'s constructor. The // message loop is provided by ChromeRenderViewHostTestHarness. - BrowserThread ui_thread_(BrowserThread::UI, - MessageLoopForUI::current()); + content::TestBrowserThread ui_thread_(BrowserThread::UI, + MessageLoopForUI::current()); // |test_sync_internals_ui_|'s constructor triggers all the // expectations above. test_sync_internals_ui_.reset(new TestSyncInternalsUI(contents())); diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 56da3fb..f33b546 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 0e358a0..1355216 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" @@ -51,7 +51,7 @@ class WebUISourcesTest : public testing::Test { } MessageLoop loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<MockThemeSource> theme_source_; @@ -77,7 +77,8 @@ TEST_F(WebUISourcesTest, ThemeSourceImages) { } TEST_F(WebUISourcesTest, ThemeSourceCSS) { - BrowserThread io_thread(BrowserThread::IO, MessageLoop::current()); + content::TestBrowserThread io_thread(BrowserThread::IO, + MessageLoop::current()); // Generating the test data for the NTP CSS would just involve copying the // method, or being super brittle and hard-coding the result (requiring // an update to the unittest every time the CSS template changes), so we diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 091bff4..0bbdfe0 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -8,10 +8,10 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class WebUITest : public TabContentsWrapperTestHarness { @@ -77,7 +77,7 @@ class WebUITest : public TabContentsWrapperTestHarness { } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; DISALLOW_COPY_AND_ASSIGN(WebUITest); }; diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index b5aced6..a2db8bc 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -17,7 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/installer/util/browser_distribution.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 5a992a8..8b0296a 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -10,7 +10,7 @@ #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.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 "googleurl/src/gurl.h" diff --git a/chrome/browser/user_style_sheet_watcher_unittest.cc b/chrome/browser/user_style_sheet_watcher_unittest.cc index 14f0c76..5a90d44 100644 --- a/chrome/browser/user_style_sheet_watcher_unittest.cc +++ b/chrome/browser/user_style_sheet_watcher_unittest.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/threading/thread.h" #include "chrome/test/base/testing_browser_process.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" TEST(UserStyleSheetWatcherTest, StyleLoad) { @@ -30,9 +30,9 @@ TEST(UserStyleSheetWatcherTest, StyleLoad) { base::Thread io_thread("UserStyleSheetWatcherTestIOThread"); base::Thread::Options options(MessageLoop::TYPE_IO, 0); ASSERT_TRUE(io_thread.StartWithOptions(options)); - BrowserThread browser_ui_thread(BrowserThread::UI, &loop); - BrowserThread browser_file_thread(BrowserThread::FILE, - io_thread.message_loop()); + content::TestBrowserThread browser_ui_thread(BrowserThread::UI, &loop); + content::TestBrowserThread browser_file_thread(BrowserThread::FILE, + io_thread.message_loop()); // It is important that the creation of |style_sheet_watcher| occur after the // creation of |browser_ui_thread| because UserStyleSheetWatchers are diff --git a/chrome/browser/visitedlink/visitedlink_master.cc b/chrome/browser/visitedlink/visitedlink_master.cc index 6e8fcc3..966bd39 100644 --- a/chrome/browser/visitedlink/visitedlink_master.cc +++ b/chrome/browser/visitedlink/visitedlink_master.cc @@ -22,9 +22,9 @@ #include "base/stack_container.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile.h" +#include "content/public/browser/browser_thread.h" using file_util::ScopedFILE; using file_util::OpenFile; diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc index f885f93..07deff2 100644 --- a/chrome/browser/visitedlink/visitedlink_unittest.cc +++ b/chrome/browser/visitedlink/visitedlink_unittest.cc @@ -2,26 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <vector> -#include <string> #include <cstdio> +#include <string> +#include <vector> -#include "base/message_loop.h" #include "base/file_util.h" +#include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/shared_memory.h" #include "base/string_util.h" -#include "chrome/browser/visitedlink/visitedlink_master.h" #include "chrome/browser/visitedlink/visitedlink_event_listener.h" +#include "chrome/browser/visitedlink/visitedlink_master.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/visitedlink_slave.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/browser_render_process_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -178,8 +178,8 @@ class VisitedLinkTest : public testing::Test { ScopedTempDir temp_dir_; MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; // Filenames for the services; FilePath history_dir_; @@ -597,8 +597,8 @@ class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness { VisitedLinkRenderProcessHostFactory vc_rph_factory_; private: - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(VisitedLinkEventsTest); }; diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 3ef5a90..b636403 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -20,8 +20,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_file.h" +#include "content/public/browser/browser_thread.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include "base/environment.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 8219e69..be6ece0 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/common/extensions/extension_messages.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 WebApplicationTest : public TabContentsWrapperTestHarness { @@ -20,7 +20,7 @@ class WebApplicationTest : public TabContentsWrapperTestHarness { } private: - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(WebApplicationTest, GetShortcutInfoForTab) { diff --git a/chrome/browser/web_resource/gpu_blacklist_updater.cc b/chrome/browser/web_resource/gpu_blacklist_updater.cc index 34ed94c..1ae31389 100644 --- a/chrome/browser/web_resource/gpu_blacklist_updater.cc +++ b/chrome/browser/web_resource/gpu_blacklist_updater.cc @@ -15,9 +15,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_blacklist.h" #include "content/browser/gpu/gpu_data_manager.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index bc9f75b..8bac134 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -20,7 +20,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.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_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index b445ab3..50841f9 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -20,7 +20,7 @@ #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/web_resource/web_resource_unpacker.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/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc index 50eaba3..99d42c6 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc @@ -12,11 +12,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/webdata/autofill_table.h" -#include "chrome/browser/webdata/web_database.h" #include "chrome/browser/webdata/web_data_service.h" +#include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/guid.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/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc index d86da97..089e24c 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/sync/internal_api/syncapi_mock.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/syncable/syncable_mock.h" -#include "chrome/browser/webdata/autofill_profile_syncable_service.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/webdata/autofill_change.h" +#include "chrome/browser/webdata/autofill_profile_syncable_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -111,7 +111,7 @@ class AutofillProfileSyncableServiceTest : public testing::Test { } protected: MessageLoop message_loop_; - BrowserThread db_thread_; + content::TestBrowserThread db_thread_; MockAutofillProfileSyncableService autofill_syncable_service_; scoped_ptr<MockSyncChangeProcessor> sync_processor_; }; diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 422fcfd..de709d5 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "sql/init_status.h" class AutofillChange; diff --git a/chrome/browser/webdata/web_data_service_test_util.h b/chrome/browser/webdata/web_data_service_test_util.h index faaffb6..0a3b2e5 100644 --- a/chrome/browser/webdata/web_data_service_test_util.h +++ b/chrome/browser/webdata/web_data_service_test_util.h @@ -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. @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/webdata/web_data_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" template <class T> class AutofillWebDataServiceConsumer: public WebDataServiceConsumer { diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 123fc71..d43d1b7 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -28,9 +28,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" #include "chrome/test/base/thread_observer_helper.h" -#include "content/browser/browser_thread.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.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/form_field.h" @@ -92,8 +92,8 @@ class WebDataServiceTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; FilePath profile_dir_; scoped_refptr<WebDataService> wds_; ScopedTempDir temp_dir_; diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index dcd58e8..a9e4b9d 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -19,10 +19,10 @@ #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_entry.h" #include "chrome/browser/webdata/web_database.h" -#include "content/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/test/test_browser_thread.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" @@ -189,7 +189,7 @@ class WebDatabaseMigrationTest : public testing::Test { private: MessageLoopForUI message_loop_for_ui_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; ScopedTempDir temp_dir_; DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest); diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 41609e9..c5955d0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3719,6 +3719,7 @@ 'chrome_resources', 'chrome_strings', '../content/content.gyp:content_gpu', + '../content/content.gyp:test_support_content', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h index fc70d95..514c394 100644 --- a/chrome/test/base/browser_with_test_window_test.h +++ b/chrome/test/base/browser_with_test_window_test.h @@ -10,8 +10,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class GURL; @@ -97,8 +97,8 @@ class BrowserWithTestWindowTest : public testing::Test { private: // We need to create a MessageLoop, otherwise a bunch of things fails. MessageLoopForUI ui_loop_; - BrowserThread ui_thread_; - BrowserThread file_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; scoped_ptr<TestBrowserWindow> window_; diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index d7df59e..92df821 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -29,12 +29,12 @@ #include "chrome/test/base/test_launcher_utils.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/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/renderer/mock_content_renderer_client.h" +#include "content/test/test_browser_thread.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" diff --git a/chrome/test/base/test_url_request_context_getter.cc b/chrome/test/base/test_url_request_context_getter.cc index 91c7649..c3c84aa 100644 --- a/chrome/test/base/test_url_request_context_getter.cc +++ b/chrome/test/base/test_url_request_context_getter.cc @@ -4,7 +4,7 @@ #include "chrome/test/base/test_url_request_context_getter.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_test_util.h" TestURLRequestContextGetter::TestURLRequestContextGetter() {} diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 0fe3bf2..e5f677c 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -48,9 +48,9 @@ #include "chrome/test/base/test_url_request_context_getter.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/mock_resource_context.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" @@ -59,8 +59,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "webkit/database/database_tracker.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/quota/quota_manager.h" #include "webkit/quota/mock_quota_manager.h" +#include "webkit/quota/quota_manager.h" using base::Time; using testing::NiceMock; diff --git a/chrome/test/base/thread_observer_helper.h b/chrome/test/base/thread_observer_helper.h index b6fe3f1..4c22123 100644 --- a/chrome/test/base/thread_observer_helper.h +++ b/chrome/test/base/thread_observer_helper.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/test/notification_observer_mock.h" diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS index 4f8f521..5e2a516 100644 --- a/chrome/tools/DEPS +++ b/chrome/tools/DEPS @@ -2,4 +2,5 @@ include_rules = [ "+chrome/browser", "+chrome/third_party/hunspell/google", "+content/browser", + "+content/public/browser", ] diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 83a73b2..7f07110 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -23,8 +23,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/thumbnail_score.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/notification_service_impl.h" +#include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" @@ -235,8 +235,8 @@ int main(int argc, const char* argv[]) { ResourceBundle::InitSharedInstance("en-US"); NotificationServiceImpl notification_service; MessageLoopForUI message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread db_thread(BrowserThread::DB, &message_loop); + DeprecatedBrowserThread ui_thread(BrowserThread::UI, &message_loop); + DeprecatedBrowserThread db_thread(BrowserThread::DB, &message_loop); TestingProfile profile; profile.CreateHistoryService(false, false); if (types & TOP_SITES) { diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 48ed3ee..7129c91 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -304,8 +304,8 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) registrar_(chrome_frame_test::GetTestBedType()), test_result_(0) { // Register the main thread by instantiating it, but don't call any methods. - main_thread_.reset(new BrowserThread(BrowserThread::UI, - MessageLoop::current())); + main_thread_.reset(new DeprecatedBrowserThread(BrowserThread::UI, + MessageLoop::current())); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); fake_chrome_.Initialize(); pss_subclass_.reset(new ProcessSingletonSubclass(this)); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index f804bb2..ea72a7b 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -13,11 +13,11 @@ #include "base/win/scoped_handle.h" #include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/browser_process_impl.h" -#include "chrome_frame/test_utils.h" -#include "chrome_frame/test/test_server.h" -#include "chrome_frame/test/net/test_automation_provider.h" #include "chrome_frame/test/net/process_singleton_subclass.h" -#include "content/browser/browser_thread.h" +#include "chrome_frame/test/net/test_automation_provider.h" +#include "chrome_frame/test/test_server.h" +#include "chrome_frame/test_utils.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_test_suite.h" class ProcessSingleton; @@ -105,7 +105,7 @@ class CFUrlRequestUnittestRunner // on the main thread. FakeExternalTab fake_chrome_; scoped_ptr<ProcessSingletonSubclass> pss_subclass_; - scoped_ptr<BrowserThread> main_thread_; + scoped_ptr<DeprecatedBrowserThread> main_thread_; ScopedChromeFrameRegistrar registrar_; int test_result_; }; diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 760bb79..7dd88e6 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -54,7 +54,7 @@ #include "chrome_frame/test/ie_event_sink.h" #include "chrome_frame/test/reliability/page_load_test.h" #include "chrome_frame/utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/net_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h index e5f73e1..c941297 100644 --- a/content/browser/appcache/chrome_appcache_service.h +++ b/content/browser/appcache/chrome_appcache_service.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "webkit/appcache/appcache_policy.h" diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc index 0ea064f..4df4a6e 100644 --- a/content/browser/appcache/chrome_appcache_service_unittest.cc +++ b/content/browser/appcache/chrome_appcache_service_unittest.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/appcache/appcache_database.h" #include "webkit/appcache/appcache_storage_impl.h" @@ -56,10 +56,10 @@ class ChromeAppCacheServiceTest : public testing::Test { const GURL kSessionOnlyManifestURL; private: - BrowserThread db_thread_; - BrowserThread file_thread_; - BrowserThread cache_thread_; - BrowserThread io_thread_; + content::TestBrowserThread db_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread cache_thread_; + content::TestBrowserThread io_thread_; }; scoped_refptr<ChromeAppCacheService> diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index 53276e6..532b2cd 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -13,13 +13,13 @@ #include "base/process_util.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "content/browser/trace_message_filter.h" -#include "content/public/browser/notification_service.h" #include "content/common/plugin_messages.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index 9627f36..3609290 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "content/browser/browser_main_loop.h" -#include "content/browser/browser_thread.h" #include "content/browser/notification_service_impl.h" #include "content/common/main_function_params.h" #include "content/public/common/content_switches.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 944d40c..f9b1102 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -12,7 +12,7 @@ #include "base/metrics/histogram.h" #include "base/threading/thread_restrictions.h" #include "base/tracked_objects.h" -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "content/common/sandbox_policy.h" @@ -239,6 +239,9 @@ void BrowserMainLoop::MainMessageLoopStart() { } #endif + // Must first NULL pointer or we hit a DCHECK that the newly constructed + // message loop is the current one. + main_message_loop_.reset(); main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); InitializeMainThread(); @@ -295,8 +298,8 @@ void BrowserMainLoop::InitializeMainThread() { #endif // TRACK_ALL_TASK_OBJECTS // Register the main thread by instantiating it, but don't call any methods. - main_thread_.reset(new BrowserThread(BrowserThread::UI, - MessageLoop::current())); + main_thread_.reset(new BrowserThreadImpl(BrowserThread::UI, + MessageLoop::current())); } void BrowserMainLoop::InitializeToolkit() { diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h index e9f67a6..32d0c58 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -class BrowserThread; class CommandLine; class HighResolutionTimerManager; class MessageLoop; @@ -29,6 +28,7 @@ class NetworkChangeNotifier; namespace content { class BrowserMainParts; +class BrowserThreadImpl; // Implements the main browser loop stages called from |BrowserMain()|. // See comments in browser_main_parts.h for additional info. @@ -65,7 +65,7 @@ class BrowserMainLoop { scoped_ptr<base::SystemMonitor> system_monitor_; scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; - scoped_ptr<BrowserThread> main_thread_; + scoped_ptr<BrowserThreadImpl> main_thread_; DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); }; diff --git a/content/browser/browser_message_filter.h b/content/browser/browser_message_filter.h index 2ad88b8..69223f0 100644 --- a/content/browser/browser_message_filter.h +++ b/content/browser/browser_message_filter.h @@ -7,8 +7,8 @@ #pragma once #include "base/process.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "ipc/ipc_channel_proxy.h" // Base class for message filters in the browser process. You can receive and diff --git a/content/browser/browser_process_sub_thread.cc b/content/browser/browser_process_sub_thread.cc index f748d08..31c129e 100644 --- a/content/browser/browser_process_sub_thread.cc +++ b/content/browser/browser_process_sub_thread.cc @@ -11,8 +11,10 @@ #include <Objbase.h> #endif +namespace content { + BrowserProcessSubThread::BrowserProcessSubThread(BrowserThread::ID identifier) - : BrowserThread(identifier) {} + : BrowserThreadImpl(identifier) {} BrowserProcessSubThread::~BrowserProcessSubThread() { // We cannot rely on our base class to stop the thread since we want our @@ -39,3 +41,5 @@ void BrowserProcessSubThread::CleanUp() { CoUninitialize(); #endif } + +} // namespace content diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h index adbda97..ac3f8560 100644 --- a/content/browser/browser_process_sub_thread.h +++ b/content/browser/browser_process_sub_thread.h @@ -7,13 +7,15 @@ #pragma once #include "base/basictypes.h" -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "content/common/content_export.h" namespace content { class NotificationService; } +namespace content { + // ---------------------------------------------------------------------------- // BrowserProcessSubThread // @@ -23,7 +25,7 @@ class NotificationService; // Applications must initialize the COM library before they can call // COM library functions other than CoGetMalloc and memory allocation // functions, so this class initializes COM for those users. -class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThread { +class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThreadImpl { public: explicit BrowserProcessSubThread(BrowserThread::ID identifier); virtual ~BrowserProcessSubThread(); @@ -36,9 +38,11 @@ class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThread { // Each specialized thread has its own notification service. // Note: We don't use scoped_ptr because the destructor runs on the wrong // thread. - content::NotificationService* notification_service_; + NotificationService* notification_service_; DISALLOW_COPY_AND_ASSIGN(BrowserProcessSubThread); }; +} // namespace content + #endif // CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_ diff --git a/content/browser/browser_thread.cc b/content/browser/browser_thread_impl.cc index c3b4005..39fa636 100644 --- a/content/browser/browser_thread.cc +++ b/content/browser/browser_thread_impl.cc @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "base/bind.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/threading/thread_restrictions.h" +namespace { + // Friendly names for the well-known threads. static const char* browser_thread_names[BrowserThread::ID_COUNT] = { "", // UI (name assembled in browser_main.cc). @@ -23,6 +25,120 @@ static const char* browser_thread_names[BrowserThread::ID_COUNT] = { #endif }; +} // namespace + +namespace content { + +base::Lock BrowserThreadImpl::lock_; + +BrowserThread* BrowserThreadImpl::browser_threads_[ID_COUNT]; + +BrowserThreadImpl::BrowserThreadImpl(BrowserThread::ID identifier) + : BrowserThread(identifier) { +} + +BrowserThreadImpl::BrowserThreadImpl(BrowserThread::ID identifier, + MessageLoop* message_loop) + : BrowserThread(identifier, message_loop) { +} + +BrowserThreadImpl::~BrowserThreadImpl() { +} + +// static +bool BrowserThreadImpl::PostTaskHelper( + BrowserThread::ID identifier, + const tracked_objects::Location& from_here, + Task* task, + int64 delay_ms, + bool nestable) { + DCHECK(identifier >= 0 && identifier < ID_COUNT); + // Optimization: to avoid unnecessary locks, we listed the ID enumeration in + // order of lifetime. So no need to lock if we know that the other thread + // outlives this one. + // Note: since the array is so small, ok to loop instead of creating a map, + // which would require a lock because std::map isn't thread safe, defeating + // the whole purpose of this optimization. + BrowserThread::ID current_thread; + bool guaranteed_to_outlive_target_thread = + GetCurrentThreadIdentifier(¤t_thread) && + current_thread >= identifier; + + if (!guaranteed_to_outlive_target_thread) + BrowserThreadImpl::lock_.Acquire(); + + MessageLoop* message_loop = BrowserThreadImpl::browser_threads_[identifier] ? + BrowserThreadImpl::browser_threads_[identifier]->message_loop() : NULL; + if (message_loop) { + if (nestable) { + message_loop->PostDelayedTask(from_here, task, delay_ms); + } else { + message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms); + } + } + + if (!guaranteed_to_outlive_target_thread) + BrowserThreadImpl::lock_.Release(); + + if (!message_loop) + delete task; + + return !!message_loop; +} + +// static +bool BrowserThreadImpl::PostTaskHelper( + BrowserThread::ID identifier, + const tracked_objects::Location& from_here, + const base::Closure& task, + int64 delay_ms, + bool nestable) { + DCHECK(identifier >= 0 && identifier < ID_COUNT); + // Optimization: to avoid unnecessary locks, we listed the ID enumeration in + // order of lifetime. So no need to lock if we know that the other thread + // outlives this one. + // Note: since the array is so small, ok to loop instead of creating a map, + // which would require a lock because std::map isn't thread safe, defeating + // the whole purpose of this optimization. + BrowserThread::ID current_thread; + bool guaranteed_to_outlive_target_thread = + GetCurrentThreadIdentifier(¤t_thread) && + current_thread >= identifier; + + if (!guaranteed_to_outlive_target_thread) + lock_.Acquire(); + + MessageLoop* message_loop = browser_threads_[identifier] ? + browser_threads_[identifier]->message_loop() : NULL; + if (message_loop) { + if (nestable) { + message_loop->PostDelayedTask(from_here, task, delay_ms); + } else { + message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms); + } + } + + if (!guaranteed_to_outlive_target_thread) + lock_.Release(); + + return !!message_loop; +} + +} // namespace content + +using content::BrowserThreadImpl; + +// TODO(joi): Remove +DeprecatedBrowserThread::DeprecatedBrowserThread(BrowserThread::ID identifier) + : BrowserThread(identifier) { +} +DeprecatedBrowserThread::DeprecatedBrowserThread(BrowserThread::ID identifier, + MessageLoop* message_loop) + : BrowserThread(identifier, message_loop) { +} +DeprecatedBrowserThread::~DeprecatedBrowserThread() { +} + // An implementation of MessageLoopProxy to be used in conjunction // with BrowserThread. class BrowserThreadMessageLoopProxy : public base::MessageLoopProxy { @@ -87,18 +203,14 @@ class BrowserThreadMessageLoopProxy : public base::MessageLoopProxy { DISALLOW_COPY_AND_ASSIGN(BrowserThreadMessageLoopProxy); }; - -base::Lock BrowserThread::lock_; - -BrowserThread* BrowserThread::browser_threads_[ID_COUNT]; - -BrowserThread::BrowserThread(BrowserThread::ID identifier) +BrowserThread::BrowserThread(ID identifier) : Thread(browser_thread_names[identifier]), identifier_(identifier) { Initialize(); } -BrowserThread::BrowserThread(ID identifier, MessageLoop* message_loop) +BrowserThread::BrowserThread(ID identifier, + MessageLoop* message_loop) : Thread(message_loop->thread_name().c_str()), identifier_(identifier) { set_message_loop(message_loop); @@ -106,10 +218,10 @@ BrowserThread::BrowserThread(ID identifier, MessageLoop* message_loop) } void BrowserThread::Initialize() { - base::AutoLock lock(lock_); + base::AutoLock lock(BrowserThreadImpl::lock_); DCHECK(identifier_ >= 0 && identifier_ < ID_COUNT); - DCHECK(browser_threads_[identifier_] == NULL); - browser_threads_[identifier_] = this; + DCHECK(BrowserThreadImpl::browser_threads_[identifier_] == NULL); + BrowserThreadImpl::browser_threads_[identifier_] = this; } BrowserThread::~BrowserThread() { @@ -118,12 +230,12 @@ BrowserThread::~BrowserThread() { // correct BrowserThread succeeds. Stop(); - base::AutoLock lock(lock_); - browser_threads_[identifier_] = NULL; + base::AutoLock lock(BrowserThreadImpl::lock_); + BrowserThreadImpl::browser_threads_[identifier_] = NULL; #ifndef NDEBUG // Double check that the threads are ordered correctly in the enumeration. for (int i = identifier_ + 1; i < ID_COUNT; ++i) { - DCHECK(!browser_threads_[i]) << + DCHECK(!BrowserThreadImpl::browser_threads_[i]) << "Threads must be listed in the reverse order that they die"; } #endif @@ -131,9 +243,9 @@ BrowserThread::~BrowserThread() { // static bool BrowserThread::IsWellKnownThread(ID identifier) { - base::AutoLock lock(lock_); + base::AutoLock lock(BrowserThreadImpl::lock_); return (identifier >= 0 && identifier < ID_COUNT && - browser_threads_[identifier]); + BrowserThreadImpl::browser_threads_[identifier]); } // static @@ -143,33 +255,36 @@ bool BrowserThread::CurrentlyOn(ID identifier) { // function. // http://crbug.com/63678 base::ThreadRestrictions::ScopedAllowSingleton allow_singleton; - base::AutoLock lock(lock_); + base::AutoLock lock(BrowserThreadImpl::lock_); DCHECK(identifier >= 0 && identifier < ID_COUNT); - return browser_threads_[identifier] && - browser_threads_[identifier]->message_loop() == MessageLoop::current(); + return BrowserThreadImpl::browser_threads_[identifier] && + BrowserThreadImpl::browser_threads_[identifier]->message_loop() == + MessageLoop::current(); } // static bool BrowserThread::IsMessageLoopValid(ID identifier) { - base::AutoLock lock(lock_); + base::AutoLock lock(BrowserThreadImpl::lock_); DCHECK(identifier >= 0 && identifier < ID_COUNT); - return browser_threads_[identifier] && - browser_threads_[identifier]->message_loop(); + return BrowserThreadImpl::browser_threads_[identifier] && + BrowserThreadImpl::browser_threads_[identifier]->message_loop(); } // static bool BrowserThread::PostTask(ID identifier, - const tracked_objects::Location& from_here, - const base::Closure& task) { - return PostTaskHelper(identifier, from_here, task, 0, true); + const tracked_objects::Location& from_here, + const base::Closure& task) { + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, 0, true); } // static bool BrowserThread::PostDelayedTask(ID identifier, - const tracked_objects::Location& from_here, - const base::Closure& task, - int64 delay_ms) { - return PostTaskHelper(identifier, from_here, task, delay_ms, true); + const tracked_objects::Location& from_here, + const base::Closure& task, + int64 delay_ms) { + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, delay_ms, true); } // static @@ -177,7 +292,8 @@ bool BrowserThread::PostNonNestableTask( ID identifier, const tracked_objects::Location& from_here, const base::Closure& task) { - return PostTaskHelper(identifier, from_here, task, 0, false); + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, 0, false); } // static @@ -186,22 +302,25 @@ bool BrowserThread::PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, int64 delay_ms) { - return PostTaskHelper(identifier, from_here, task, delay_ms, false); + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, delay_ms, false); } // static bool BrowserThread::PostTask(ID identifier, - const tracked_objects::Location& from_here, - Task* task) { - return PostTaskHelper(identifier, from_here, task, 0, true); + const tracked_objects::Location& from_here, + Task* task) { + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, 0, true); } // static bool BrowserThread::PostDelayedTask(ID identifier, - const tracked_objects::Location& from_here, - Task* task, - int64 delay_ms) { - return PostTaskHelper(identifier, from_here, task, delay_ms, true); + const tracked_objects::Location& from_here, + Task* task, + int64 delay_ms) { + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, delay_ms, true); } // static @@ -209,7 +328,8 @@ bool BrowserThread::PostNonNestableTask( ID identifier, const tracked_objects::Location& from_here, Task* task) { - return PostTaskHelper(identifier, from_here, task, 0, false); + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, 0, false); } // static @@ -218,7 +338,8 @@ bool BrowserThread::PostNonNestableDelayedTask( const tracked_objects::Location& from_here, Task* task, int64 delay_ms) { - return PostTaskHelper(identifier, from_here, task, delay_ms, false); + return BrowserThreadImpl::PostTaskHelper( + identifier, from_here, task, delay_ms, false); } // static @@ -241,9 +362,10 @@ bool BrowserThread::GetCurrentThreadIdentifier(ID* identifier) { base::ThreadRestrictions::ScopedAllowSingleton allow_singleton; MessageLoop* cur_message_loop = MessageLoop::current(); for (int i = 0; i < ID_COUNT; ++i) { - if (browser_threads_[i] && - browser_threads_[i]->message_loop() == cur_message_loop) { - *identifier = browser_threads_[i]->identifier_; + if (BrowserThreadImpl::browser_threads_[i] && + BrowserThreadImpl::browser_threads_[i]->message_loop() == + cur_message_loop) { + *identifier = BrowserThreadImpl::browser_threads_[i]->identifier_; return true; } } @@ -259,82 +381,3 @@ BrowserThread::GetMessageLoopProxyForThread( new BrowserThreadMessageLoopProxy(identifier)); return proxy; } - -// static -bool BrowserThread::PostTaskHelper( - ID identifier, - const tracked_objects::Location& from_here, - Task* task, - int64 delay_ms, - bool nestable) { - DCHECK(identifier >= 0 && identifier < ID_COUNT); - // Optimization: to avoid unnecessary locks, we listed the ID enumeration in - // order of lifetime. So no need to lock if we know that the other thread - // outlives this one. - // Note: since the array is so small, ok to loop instead of creating a map, - // which would require a lock because std::map isn't thread safe, defeating - // the whole purpose of this optimization. - ID current_thread; - bool guaranteed_to_outlive_target_thread = - GetCurrentThreadIdentifier(¤t_thread) && - current_thread >= identifier; - - if (!guaranteed_to_outlive_target_thread) - lock_.Acquire(); - - MessageLoop* message_loop = browser_threads_[identifier] ? - browser_threads_[identifier]->message_loop() : NULL; - if (message_loop) { - if (nestable) { - message_loop->PostDelayedTask(from_here, task, delay_ms); - } else { - message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms); - } - } - - if (!guaranteed_to_outlive_target_thread) - lock_.Release(); - - if (!message_loop) - delete task; - - return !!message_loop; -} - -// static -bool BrowserThread::PostTaskHelper( - ID identifier, - const tracked_objects::Location& from_here, - const base::Closure& task, - int64 delay_ms, - bool nestable) { - DCHECK(identifier >= 0 && identifier < ID_COUNT); - // Optimization: to avoid unnecessary locks, we listed the ID enumeration in - // order of lifetime. So no need to lock if we know that the other thread - // outlives this one. - // Note: since the array is so small, ok to loop instead of creating a map, - // which would require a lock because std::map isn't thread safe, defeating - // the whole purpose of this optimization. - ID current_thread; - bool guaranteed_to_outlive_target_thread = - GetCurrentThreadIdentifier(¤t_thread) && - current_thread >= identifier; - - if (!guaranteed_to_outlive_target_thread) - lock_.Acquire(); - - MessageLoop* message_loop = browser_threads_[identifier] ? - browser_threads_[identifier]->message_loop() : NULL; - if (message_loop) { - if (nestable) { - message_loop->PostDelayedTask(from_here, task, delay_ms); - } else { - message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms); - } - } - - if (!guaranteed_to_outlive_target_thread) - lock_.Release(); - - return !!message_loop; -} diff --git a/content/browser/browser_thread_impl.h b/content/browser/browser_thread_impl.h new file mode 100644 index 0000000..5c19e92 --- /dev/null +++ b/content/browser/browser_thread_impl.h @@ -0,0 +1,53 @@ +// 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. + +#ifndef CONTENT_BROWSER_BROWSER_THREAD_IMPL_H_ +#define CONTENT_BROWSER_BROWSER_THREAD_IMPL_H_ +#pragma once + +#include "content/public/browser/browser_thread.h" + +namespace content { + +class BrowserThreadImpl : public BrowserThread { + public: + explicit BrowserThreadImpl(BrowserThread::ID identifier); + BrowserThreadImpl(BrowserThread::ID identifier, MessageLoop* message_loop); + virtual ~BrowserThreadImpl(); + + private: + // We implement most functionality on the public set of + // BrowserThread functions, but state is stored in the + // BrowserThreadImpl to keep the public API cleaner. Therefore make + // BrowserThread a friend class. + friend class BrowserThread; + + // TODO(brettw) remove this variant when Task->Closure migration is complete. + static bool PostTaskHelper( + BrowserThread::ID identifier, + const tracked_objects::Location& from_here, + Task* task, + int64 delay_ms, + bool nestable); + static bool PostTaskHelper( + BrowserThread::ID identifier, + const tracked_objects::Location& from_here, + const base::Closure& task, + int64 delay_ms, + bool nestable); + + // This lock protects |browser_threads_|. Do not read or modify that array + // without holding this lock. Do not block while holding this lock. + static base::Lock lock_; + + // An array of the BrowserThread objects. This array is protected by |lock_|. + // The threads are not owned by this array. Typically, the threads are owned + // on the UI thread by the g_browser_process object. BrowserThreads remove + // themselves from this array upon destruction. + static BrowserThread* browser_threads_[ID_COUNT]; +}; + +} // namespace content + +#endif // CONTENT_BROWSER_BROWSER_THREAD_IMPL_H_ diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc index f5f6e47..11ccecc 100644 --- a/content/browser/browser_thread_unittest.cc +++ b/content/browser/browser_thread_unittest.cc @@ -6,10 +6,13 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +namespace content { + class BrowserThreadTest : public testing::Test { public: void Release() const { @@ -19,8 +22,8 @@ class BrowserThreadTest : public testing::Test { protected: virtual void SetUp() { - ui_thread_.reset(new BrowserThread(BrowserThread::UI)); - file_thread_.reset(new BrowserThread(BrowserThread::FILE)); + ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI)); + file_thread_.reset(new BrowserThreadImpl(BrowserThread::FILE)); ui_thread_->Start(); file_thread_->Start(); } @@ -79,8 +82,8 @@ class BrowserThreadTest : public testing::Test { }; private: - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> file_thread_; + scoped_ptr<BrowserThreadImpl> ui_thread_; + scoped_ptr<BrowserThreadImpl> file_thread_; // It's kind of ugly to make this mutable - solely so we can post the Quit // Task from Release(). This should be fixed. mutable MessageLoop loop_; @@ -156,7 +159,8 @@ TEST_F(BrowserThreadTest, TaskToNonExistentThreadIsDeletedViaMessageLoopProxy) { } TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadExits) { - scoped_ptr<BrowserThread> io_thread(new BrowserThread(BrowserThread::IO)); + scoped_ptr<BrowserThreadImpl> io_thread( + new BrowserThreadImpl(BrowserThread::IO)); io_thread->Start(); io_thread->Stop(); @@ -170,7 +174,8 @@ TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadExits) { TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadIsDeleted) { { - scoped_ptr<BrowserThread> io_thread(new BrowserThread(BrowserThread::IO)); + scoped_ptr<BrowserThreadImpl> io_thread( + new BrowserThreadImpl(BrowserThread::IO)); io_thread->Start(); } bool deleted = false; @@ -180,3 +185,5 @@ TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadIsDeleted) { EXPECT_FALSE(ret); EXPECT_TRUE(deleted); } + +} diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index ea65150..e487c0d 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -12,9 +12,9 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" #include "content/common/chrome_descriptors.h" #include "content/common/process_watcher.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" @@ -26,8 +26,8 @@ #include "content/browser/mach_broker_mac.h" #elif defined(OS_POSIX) #include "base/memory/singleton.h" -#include "content/browser/zygote_host_linux.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/browser/zygote_host_linux.h" #endif #if defined(OS_POSIX) diff --git a/content/browser/chrome_blob_storage_context.h b/content/browser/chrome_blob_storage_context.h index a6680f9..8375833 100644 --- a/content/browser/chrome_blob_storage_context.h +++ b/content/browser/chrome_blob_storage_context.h @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" class GURL; diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc index c44594ee..9117ee6 100644 --- a/content/browser/debugger/devtools_http_protocol_handler.cc +++ b/content/browser/debugger/devtools_http_protocol_handler.cc @@ -15,12 +15,12 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/browser/debugger/devtools_client_host.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/common/devtools_messages.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc index 1cf27bd..aaddf98 100644 --- a/content/browser/debugger/devtools_manager.cc +++ b/content/browser/debugger/devtools_manager.cc @@ -7,7 +7,6 @@ #include <vector> #include "base/message_loop.h" -#include "content/browser/browser_thread.h" #include "content/browser/browsing_instance.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/debugger/devtools_client_host.h" @@ -15,6 +14,7 @@ #include "content/browser/debugger/render_view_devtools_agent_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 "content/public/browser/content_browser_client.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc index 2aa2663..53d1fbd4 100644 --- a/content/browser/debugger/devtools_netlog_observer.cc +++ b/content/browser/debugger/devtools_netlog_observer.cc @@ -7,8 +7,8 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/common/resource_response.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "net/base/load_flags.h" #include "net/http/http_net_log_params.h" diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc index a695c6a..4ec08ce 100644 --- a/content/browser/debugger/worker_devtools_manager.cc +++ b/content/browser/debugger/worker_devtools_manager.cc @@ -8,13 +8,13 @@ #include <map> #include "base/tuple.h" -#include "content/browser/browser_thread.h" #include "content/browser/debugger/devtools_agent_host.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/debugger/worker_devtools_message_filter.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/browser/worker_host/worker_service.h" #include "content/common/devtools_messages.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" diff --git a/content/browser/device_orientation/message_filter.cc b/content/browser/device_orientation/message_filter.cc index 0953dd2..46e0647b 100644 --- a/content/browser/device_orientation/message_filter.cc +++ b/content/browser/device_orientation/message_filter.cc @@ -5,12 +5,12 @@ #include "content/browser/device_orientation/message_filter.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" #include "content/browser/device_orientation/orientation.h" #include "content/browser/device_orientation/provider.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_notification_task.h" #include "content/common/device_orientation_messages.h" +#include "content/public/browser/browser_thread.h" namespace device_orientation { diff --git a/content/browser/device_orientation/provider.cc b/content/browser/device_orientation/provider.cc index e10da2b..c1cd32f 100644 --- a/content/browser/device_orientation/provider.cc +++ b/content/browser/device_orientation/provider.cc @@ -1,13 +1,13 @@ -// 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. #include "content/browser/device_orientation/provider.h" #include "base/logging.h" -#include "content/browser/browser_thread.h" #include "content/browser/device_orientation/data_fetcher.h" #include "content/browser/device_orientation/provider_impl.h" +#include "content/public/browser/browser_thread.h" #if defined(OS_MACOSX) #include "content/browser/device_orientation/accelerometer_mac.h" diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc index 9683b50..25c2434 100644 --- a/content/browser/download/base_file.cc +++ b/content/browser/download/base_file.cc @@ -10,8 +10,8 @@ #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_stats.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "crypto/secure_hash.h" #include "net/base/file_stream.h" diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc index c55696c..ee518c3 100644 --- a/content/browser/download/base_file_unittest.cc +++ b/content/browser/download/base_file_unittest.cc @@ -10,7 +10,7 @@ #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/test/test_file_util.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" #include "net/base/file_stream.h" #include "net/base/mock_file_stream.h" #include "net/base/net_errors.h" @@ -162,7 +162,7 @@ class BaseFileTest : public testing::Test { // Mock file thread to satisfy debug checks in BaseFile. MessageLoop message_loop_; - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; }; // Test the most basic scenario: just create the object and do a sanity check diff --git a/content/browser/download/download_file.cc b/content/browser/download/download_file.cc index 147c7fe..a2bfb34 100644 --- a/content/browser/download/download_file.cc +++ b/content/browser/download/download_file.cc @@ -8,9 +8,9 @@ #include "base/file_util.h" #include "base/stringprintf.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_manager.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc index e6ecc9f..b9d9362 100644 --- a/content/browser/download/download_file_manager.cc +++ b/content/browser/download/download_file_manager.cc @@ -9,7 +9,6 @@ #include "base/stl_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_buffer.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" @@ -17,6 +16,7 @@ #include "content/browser/download/download_request_handle.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager_delegate.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index 7851d34..44fb740 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -5,7 +5,6 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file.h" #include "content/browser/download/download_manager.h" @@ -13,6 +12,7 @@ #include "content/browser/download/download_status_updater.h" #include "content/browser/download/mock_download_manager.h" #include "content/browser/download/mock_download_manager_delegate.h" +#include "content/test/test_browser_thread.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" @@ -105,9 +105,9 @@ class DownloadFileTest : public testing::Test { private: MessageLoop loop_; // UI thread. - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; // File thread to satisfy debug checks in DownloadFile. - BrowserThread file_thread_; + content::TestBrowserThread file_thread_; // Keep track of what data should be saved to the disk file. std::string expected_data_; diff --git a/content/browser/download/download_id_unittest.cc b/content/browser/download/download_id_unittest.cc index 39d9f3b..2e09525 100644 --- a/content/browser/download/download_id_unittest.cc +++ b/content/browser/download/download_id_unittest.cc @@ -9,8 +9,9 @@ #include <set> #include <vector> -#include "content/browser/download/mock_download_manager_delegate.h" #include "content/browser/download/mock_download_manager.h" +#include "content/browser/download/mock_download_manager_delegate.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class DownloadIdTest : public testing::Test { @@ -45,7 +46,8 @@ class DownloadIdTest : public testing::Test { scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_; scoped_refptr<DownloadManager> download_managers_[2]; MessageLoopForUI message_loop_; - BrowserThread ui_thread_; // Necessary to delete |DownloadManager|s. + // Necessary to delete |DownloadManager|s. + content::TestBrowserThread ui_thread_; size_t num_managers_; DISALLOW_COPY_AND_ASSIGN(DownloadIdTest); diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc index 84387b6..d684930 100644 --- a/content/browser/download/download_item.cc +++ b/content/browser/download/download_item.cc @@ -14,10 +14,8 @@ #include "base/stringprintf.h" #include "base/timer.h" #include "base/utf_string_conversions.h" -#include "net/base/net_util.h" -#include "content/browser/browser_thread.h" -#include "content/browser/download/download_file.h" #include "content/browser/download/download_create_info.h" +#include "content/browser/download/download_file.h" #include "content/browser/download/download_file_manager.h" #include "content/browser/download/download_id.h" #include "content/browser/download/download_manager.h" @@ -25,8 +23,10 @@ #include "content/browser/download/download_request_handle.h" #include "content/browser/download/download_stats.h" #include "content/browser/download/interrupt_reasons.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_manager_delegate.h" +#include "net/base/net_util.h" // A DownloadItem normally goes through the following states: // * Created (when download starts) diff --git a/content/browser/download/download_manager.cc b/content/browser/download/download_manager.cc index 890c9bc..37054dc 100644 --- a/content/browser/download/download_manager.cc +++ b/content/browser/download/download_manager.cc @@ -18,7 +18,6 @@ #include "base/task.h" #include "build/build_config.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file_manager.h" #include "content/browser/download/download_item.h" @@ -30,6 +29,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_manager_delegate.h" #include "content/public/browser/notification_service.h" diff --git a/content/browser/download/download_manager.h b/content/browser/download/download_manager.h index d727798..9255058 100644 --- a/content/browser/download/download_manager.h +++ b/content/browser/download/download_manager.h @@ -44,11 +44,11 @@ #include "base/observer_list.h" #include "base/synchronization/lock.h" #include "base/time.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_status_updater_delegate.h" #include "content/browser/download/interrupt_reasons.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" class DownloadFileManager; diff --git a/content/browser/download/download_request_handle.cc b/content/browser/download/download_request_handle.cc index de6d5aa..6b38e30 100644 --- a/content/browser/download/download_request_handle.cc +++ b/content/browser/download/download_request_handle.cc @@ -6,10 +6,10 @@ #include "base/stringprintf.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" // IO Thread indirections to resource dispatcher host. // Provided as targets for PostTask from within this object diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index d7b5211..7450450 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -10,7 +10,6 @@ #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" #include "base/stringprintf.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_buffer.h" #include "content/browser/download/download_create_info.h" #include "content/browser/download/download_file_manager.h" @@ -23,6 +22,7 @@ #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/common/resource_response.h" +#include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc index 69ce7a1..2b578c7 100644 --- a/content/browser/download/drag_download_file.cc +++ b/content/browser/download/drag_download_file.cc @@ -7,10 +7,10 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_stats.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "net/base/file_stream.h" DragDownloadFile::DragDownloadFile( diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index 99d185a..1483d06 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -4,14 +4,14 @@ #include "content/browser/download/drag_download_util.h" -#include "base/string_util.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "base/string_number_conversions.h" +#include "base/string_util.h" +#include "base/task.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" diff --git a/content/browser/download/mhtml_generation_manager.h b/content/browser/download/mhtml_generation_manager.h index 47c847e..704e2ee 100644 --- a/content/browser/download/mhtml_generation_manager.h +++ b/content/browser/download/mhtml_generation_manager.h @@ -10,8 +10,8 @@ #include "base/memory/ref_counted.h" #include "base/platform_file.h" #include "base/process.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "ipc/ipc_platform_file.h" class FilePath; diff --git a/content/browser/download/save_file.cc b/content/browser/download/save_file.cc index 40c6c35..c03abc7 100644 --- a/content/browser/download/save_file.cc +++ b/content/browser/download/save_file.cc @@ -1,11 +1,11 @@ -// 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. #include "content/browser/download/save_file.h" #include "base/logging.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/file_stream.h" SaveFile::SaveFile(const SaveFileCreateInfo* info) diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 88dc90e..26e7664 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -12,15 +12,15 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/save_file.h" #include "content/browser/download/save_package.h" -#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" -#include "net/base/net_util.h" #include "net/base/io_buffer.h" +#include "net/base/net_util.h" SaveFileManager::SaveFileManager(ResourceDispatcherHost* rdh) : next_id_(0), diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc index 4830c1d..67de144 100644 --- a/content/browser/download/save_file_resource_handler.cc +++ b/content/browser/download/save_file_resource_handler.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/save_file_manager.h" +#include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/url_request/url_request_status.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index be2c051..f510219 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -19,7 +19,6 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_file_manager.h" #include "content/browser/download/download_item.h" #include "content/browser/download/download_manager.h" @@ -32,6 +31,7 @@ #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_manager_delegate.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index 23b62da..d8750e7 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -9,11 +9,11 @@ #include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/save_package.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -119,7 +119,7 @@ class SavePackageTest : public RenderViewHostTestHarness { } private: - BrowserThread browser_thread_; + content::TestBrowserThread browser_thread_; // SavePackage for successfully generating file name. scoped_refptr<SavePackage> save_package_success_; diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc index c28c537..0d0c0218 100644 --- a/content/browser/file_system/browser_file_system_helper.cc +++ b/content/browser/file_system/browser_file_system_helper.cc @@ -4,9 +4,9 @@ #include "content/browser/file_system/browser_file_system_helper.h" -#include "base/file_path.h" #include "base/command_line.h" -#include "content/browser/browser_thread.h" +#include "base/file_path.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "webkit/quota/quota_manager.h" diff --git a/content/browser/font_list_async.cc b/content/browser/font_list_async.cc index f24001f..51a5403 100644 --- a/content/browser/font_list_async.cc +++ b/content/browser/font_list_async.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/common/font_list.h" +#include "content/public/browser/browser_thread.h" namespace content { diff --git a/content/browser/geolocation/core_location_data_provider_mac.h b/content/browser/geolocation/core_location_data_provider_mac.h index 24efb99..aa4eec3 100644 --- a/content/browser/geolocation/core_location_data_provider_mac.h +++ b/content/browser/geolocation/core_location_data_provider_mac.h @@ -12,8 +12,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_nsobject.h" -#include "content/browser/browser_thread.h" #include "content/common/geoposition.h" +#include "content/public/browser/browser_thread.h" #import <Foundation/Foundation.h> diff --git a/content/browser/geolocation/gps_location_provider_unittest_linux.cc b/content/browser/geolocation/gps_location_provider_unittest_linux.cc index f7bbd97..3116cf3 100644 --- a/content/browser/geolocation/gps_location_provider_unittest_linux.cc +++ b/content/browser/geolocation/gps_location_provider_unittest_linux.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/browser_thread.h" #include "content/browser/geolocation/gps_location_provider_linux.h" #include "content/browser/geolocation/libgps_wrapper_linux.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" struct gps_data_t { @@ -66,7 +66,7 @@ class GeolocationGpsProviderLinuxTests : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; LocaionProviderListenerLoopQuitter location_listener_; scoped_ptr<GpsLocationProviderLinux> provider_; }; diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index bae78d6..f6a514b 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -10,16 +10,16 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/sys_info.h" #include "base/values.h" #include "base/version.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_blacklist.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/common/gpu/gpu_messages.h" #include "content/gpu/gpu_info_collector.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 0d23a03..9909f75 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -13,7 +13,6 @@ #include "base/process_util.h" #include "base/string_piece.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_data_manager.h" #include "content/browser/gpu/gpu_process_host_ui_shim.h" #include "content/browser/renderer_host/render_widget_host.h" @@ -21,6 +20,7 @@ #include "content/common/gpu/gpu_messages.h" #include "content/gpu/gpu_child_thread.h" #include "content/gpu/gpu_process.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index df939bac..dc0057c 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -6,24 +6,24 @@ #include <algorithm> -#include "base/id_map.h" -#include "base/process_util.h" #include "base/debug/trace_event.h" +#include "base/id_map.h" #include "base/lazy_instance.h" -#include "content/browser/browser_thread.h" +#include "base/process_util.h" #include "content/browser/gpu/gpu_data_manager.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/common/gpu/gpu_messages.h" +#include "content/public/browser/browser_thread.h" #if defined(TOOLKIT_USES_GTK) // These two #includes need to come after gpu_messages.h. -#include <gdk/gdkwindow.h> // NOLINT -#include <gdk/gdkx.h> // NOLINT #include "ui/base/x/x11_util.h" #include "ui/gfx/size.h" +#include <gdk/gdkwindow.h> // NOLINT +#include <gdk/gdkx.h> // NOLINT #endif namespace { diff --git a/content/browser/host_zoom_map.cc b/content/browser/host_zoom_map.cc index 19b64f1..7d8904d 100644 --- a/content/browser/host_zoom_map.cc +++ b/content/browser/host_zoom_map.cc @@ -9,9 +9,9 @@ #include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/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/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h index 57cfbba..d51e2c7 100644 --- a/content/browser/host_zoom_map.h +++ b/content/browser/host_zoom_map.h @@ -16,8 +16,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.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/content/browser/in_process_webkit/dom_storage_context.cc b/content/browser/in_process_webkit/dom_storage_context.cc index 80940bf..383568a 100644 --- a/content/browser/in_process_webkit/dom_storage_context.cc +++ b/content/browser/in_process_webkit/dom_storage_context.cc @@ -10,11 +10,11 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/dom_storage_area.h" #include "content/browser/in_process_webkit/dom_storage_namespace.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/common/dom_storage_common.h" +#include "content/public/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.cc b/content/browser/in_process_webkit/dom_storage_message_filter.cc index fd65f89..2c19058 100644 --- a/content/browser/in_process_webkit/dom_storage_message_filter.cc +++ b/content/browser/in_process_webkit/dom_storage_message_filter.cc @@ -6,11 +6,11 @@ #include "base/bind.h" #include "base/nullable_string16.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/dom_storage_area.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/dom_storage_namespace.h" #include "content/common/dom_storage_messages.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" using WebKit::WebStorageArea; diff --git a/content/browser/in_process_webkit/dom_storage_unittest.cc b/content/browser/in_process_webkit/dom_storage_unittest.cc index 60875ce..d3438c5 100644 --- a/content/browser/in_process_webkit/dom_storage_unittest.cc +++ b/content/browser/in_process_webkit/dom_storage_unittest.cc @@ -6,6 +6,7 @@ #include "base/file_util.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/quota/mock_special_storage_policy.h" @@ -20,7 +21,7 @@ class DOMStorageTest : public testing::Test { MessageLoop message_loop_; private: - BrowserThread webkit_thread_; + content::TestBrowserThread webkit_thread_; }; TEST_F(DOMStorageTest, SessionOnly) { diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc index 5d7f0f5..d3c22d6 100644 --- a/content/browser/in_process_webkit/indexed_db_context.cc +++ b/content/browser/in_process_webkit/indexed_db_context.cc @@ -12,9 +12,9 @@ #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/indexed_db_quota_client.h" #include "content/browser/in_process_webkit/webkit_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" diff --git a/content/browser/in_process_webkit/indexed_db_context.h b/content/browser/in_process_webkit/indexed_db_context.h index 19c6b91..12696a7 100644 --- a/content/browser/in_process_webkit/indexed_db_context.h +++ b/content/browser/in_process_webkit/indexed_db_context.h @@ -15,8 +15,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "webkit/quota/quota_types.h" diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index 747a856..86e3e497 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/indexed_db_callbacks.h" #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h" #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h" #include "content/browser/renderer_host/render_message_filter.h" #include "content/browser/user_metrics.h" #include "content/common/indexed_db_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" #include "googleurl/src/gurl.h" @@ -21,9 +21,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBIndex.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBIndex.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc index 5fb7653..38f8cc2 100644 --- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc @@ -15,6 +15,7 @@ #include "content/browser/in_process_webkit/indexed_db_quota_client.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/database/database_util.h" @@ -153,8 +154,8 @@ class IndexedDBQuotaClientTest : public testing::Test { scoped_refptr<IndexedDBContext> idb_context_; base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_; MessageLoop message_loop_; - BrowserThread webkit_thread_; - BrowserThread io_thread_; + content::TestBrowserThread webkit_thread_; + content::TestBrowserThread io_thread_; quota::QuotaStatusCode delete_status_; }; diff --git a/content/browser/in_process_webkit/webkit_context.cc b/content/browser/in_process_webkit/webkit_context.cc index 37c4c54..04fdc53 100644 --- a/content/browser/in_process_webkit/webkit_context.cc +++ b/content/browser/in_process_webkit/webkit_context.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" WebKitContext::WebKitContext( bool is_incognito, const FilePath& data_path, diff --git a/content/browser/in_process_webkit/webkit_context_unittest.cc b/content/browser/in_process_webkit/webkit_context_unittest.cc index 2982e62..f03cbef 100644 --- a/content/browser/in_process_webkit/webkit_context_unittest.cc +++ b/content/browser/in_process_webkit/webkit_context_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/test/test_browser_context.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class MockDOMStorageContext : public DOMStorageContext { @@ -47,7 +47,8 @@ TEST(WebKitContextTest, PurgeMemory) { // Start up a WebKit thread for the WebKitContext to call the // DOMStorageContext on. MessageLoop message_loop(MessageLoop::TYPE_DEFAULT); - BrowserThread webkit_thread(BrowserThread::WEBKIT, &message_loop); + content::TestBrowserThread webkit_thread(BrowserThread::WEBKIT, + &message_loop); { // Create the contexts. diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc index 42f35be..128de28 100644 --- a/content/browser/in_process_webkit/webkit_thread.cc +++ b/content/browser/in_process_webkit/webkit_thread.cc @@ -37,7 +37,7 @@ void WebKitThread::Initialize() { } WebKitThread::InternalWebKitThread::InternalWebKitThread() - : BrowserThread(BrowserThread::WEBKIT) { + : content::BrowserThreadImpl(BrowserThread::WEBKIT) { } WebKitThread::InternalWebKitThread::~InternalWebKitThread() { diff --git a/content/browser/in_process_webkit/webkit_thread.h b/content/browser/in_process_webkit/webkit_thread.h index c6f34fc..5c62e2e 100644 --- a/content/browser/in_process_webkit/webkit_thread.h +++ b/content/browser/in_process_webkit/webkit_thread.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "content/common/content_export.h" class BrowserWebKitPlatformSupportImpl; @@ -25,7 +25,7 @@ class CONTENT_EXPORT WebKitThread { private: // Must be private so that we can carefully control its lifetime. - class InternalWebKitThread : public BrowserThread { + class InternalWebKitThread : public content::BrowserThreadImpl { public: InternalWebKitThread(); virtual ~InternalWebKitThread(); diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc index 85fd3a8..d27c8ba 100644 --- a/content/browser/mach_broker_mac.cc +++ b/content/browser/mach_broker_mac.cc @@ -12,9 +12,9 @@ #include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/child_process_info.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/content_switches.h" diff --git a/content/browser/net/url_request_slow_download_job.cc b/content/browser/net/url_request_slow_download_job.cc index a2bdf0ca..bbdcc44 100644 --- a/content/browser/net/url_request_slow_download_job.cc +++ b/content/browser/net/url_request_slow_download_job.cc @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stringprintf.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" +#include "base/stringprintf.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/http/http_response_headers.h" diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc index e27e543..613e125 100644 --- a/content/browser/plugin_loader_posix.cc +++ b/content/browser/plugin_loader_posix.cc @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" -#include "content/browser/browser_thread.h" #include "content/common/utility_messages.h" +#include "content/public/browser/browser_thread.h" #include "webkit/plugins/npapi/plugin_list.h" using webkit::npapi::PluginList; diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index eb18428..d92eee0 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/file_path.h" -#include "base/message_loop.h" #include "base/memory/ref_counted.h" +#include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/webplugininfo.h" class MockPluginLoaderPosix : public PluginLoaderPosix { @@ -82,8 +82,8 @@ class PluginLoaderPosixTest : public testing::Test { private: MessageLoopForIO message_loop_; - BrowserThread file_thread_; - BrowserThread io_thread_; + content::TestBrowserThread file_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<MockPluginLoaderPosix> plugin_loader_; }; diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 9da4b16..3207d35 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -20,18 +20,18 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "content/common/plugin_messages.h" #include "content/common/resource_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/native_widget_types.h" #include "ui/gfx/gl/gl_switches.h" +#include "ui/gfx/native_widget_types.h" #if defined(USE_X11) #include "ui/gfx/gtk_native_view_id_manager.h" diff --git a/content/browser/plugin_process_host_mac.cc b/content/browser/plugin_process_host_mac.cc index 6d7bfb5..333cf05 100644 --- a/content/browser/plugin_process_host_mac.cc +++ b/content/browser/plugin_process_host_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/mac/mac_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/common/plugin_messages.h" +#include "content/public/browser/browser_thread.h" #include "ui/gfx/rect.h" void PluginProcessHost::OnPluginSelectWindow(uint32 window_id, diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 52ce8550..166ddf9 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -16,7 +16,6 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_loader_posix.h" #include "content/browser/plugin_service_filter.h" #include "content/browser/ppapi_plugin_process_host.h" @@ -24,12 +23,13 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/resource_context.h" #include "content/browser/utility_process_host.h" -#include "content/public/browser/notification_service.h" #include "content/common/pepper_plugin_registry.h" #include "content/common/plugin_messages.h" #include "content/common/utility_messages.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/content_switches.h" #include "webkit/plugins/npapi/plugin_constants_win.h" diff --git a/content/browser/plugin_service_browsertest.cc b/content/browser/plugin_service_browsertest.cc index 55db351..eb46f9f 100644 --- a/content/browser/plugin_service_browsertest.cc +++ b/content/browser/plugin_service_browsertest.cc @@ -11,9 +11,9 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" #include "content/browser/resource_context.h" #include "content/public/common/content_switches.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/content/browser/power_save_blocker_common.cc b/content/browser/power_save_blocker_common.cc index 68c69f2..483d57c 100644 --- a/content/browser/power_save_blocker_common.cc +++ b/content/browser/power_save_blocker_common.cc @@ -5,7 +5,7 @@ #include "content/browser/power_save_blocker.h" #include "base/bind.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // Accessed only from the UI thread. int PowerSaveBlocker::blocker_count_[kPowerSaveBlockPreventStateCount]; diff --git a/content/browser/power_save_blocker_mac.cc b/content/browser/power_save_blocker_mac.cc index bdcf6f4..4bfcf19 100644 --- a/content/browser/power_save_blocker_mac.cc +++ b/content/browser/power_save_blocker_mac.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { diff --git a/content/browser/power_save_blocker_win.cc b/content/browser/power_save_blocker_win.cc index 1a7ce93..1b63735 100644 --- a/content/browser/power_save_blocker_win.cc +++ b/content/browser/power_save_blocker_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" // Called only from UI thread. // static diff --git a/content/browser/renderer_host/accelerated_plugin_view_mac.mm b/content/browser/renderer_host/accelerated_plugin_view_mac.mm index 80a8a68..69757c5 100644 --- a/content/browser/renderer_host/accelerated_plugin_view_mac.mm +++ b/content/browser/renderer_host/accelerated_plugin_view_mac.mm @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h" +#include "content/public/browser/browser_thread.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc index 590f9b32..b4363d92 100644 --- a/content/browser/renderer_host/buffered_resource_handler.cc +++ b/content/browser/renderer_host/buffered_resource_handler.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/download/download_resource_handler.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" @@ -18,6 +17,7 @@ #include "content/browser/renderer_host/x509_user_cert_resource_handler.h" #include "content/browser/resource_context.h" #include "content/common/resource_response.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_dispatcher_host_delegate.h" #include "net/base/io_buffer.h" diff --git a/content/browser/renderer_host/clipboard_message_filter_mac.mm b/content/browser/renderer_host/clipboard_message_filter_mac.mm index 829a227..b8e7be1 100644 --- a/content/browser/renderer_host/clipboard_message_filter_mac.mm +++ b/content/browser/renderer_host/clipboard_message_filter_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 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. @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #include "base/sys_string_conversions.h" -#include "content/browser/browser_thread.h" #import "content/browser/find_pasteboard.h" +#include "content/public/browser/browser_thread.h" // The number of utf16 code units that will be written to the find pasteboard, // longer texts are silently ignored. This is to prevent that a compromised diff --git a/content/browser/renderer_host/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java_bridge_dispatcher_host.cc index 2cc6486..60e33fb 100644 --- a/content/browser/renderer_host/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java_bridge_dispatcher_host.cc @@ -4,14 +4,14 @@ #include "content/browser/renderer_host/java_bridge_dispatcher_host.h" -#include "content/browser/browser_thread.h" -#include "content/browser/renderer_host/java_bridge_channel_host.h" #include "content/browser/renderer_host/browser_render_process_host.h" +#include "content/browser/renderer_host/java_bridge_channel_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" #include "content/common/npobject_stub.h" #include "content/common/npobject_util.h" // For CreateNPVariantParam() +#include "content/public/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" JavaBridgeDispatcherHost::JavaBridgeDispatcherHost( diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc index 3ff3949..d3d5036 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h" +#include "content/public/browser/browser_thread.h" #include "media/audio/audio_manager.h" namespace media_stream { diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc index 8892c93..dd6d303 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/audio_input_device_manager.h" #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h" +#include "content/test/test_browser_thread.h" #include "media/audio/audio_manager.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -85,7 +85,8 @@ class AudioInputDeviceManagerTest: public testing::Test { virtual void SetUp() { // The test must run on Browser::IO. message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); - io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, + message_loop_.get())); manager_.reset(new media_stream::AudioInputDeviceManager()); audio_input_listener_.reset(new MockAudioInputDeviceManagerListener()); manager_->Register(audio_input_listener_.get()); @@ -127,7 +128,7 @@ class AudioInputDeviceManagerTest: public testing::Test { message_loop_->Run(); } scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<AudioInputDeviceManager> manager_; scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_; diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index e1fb65f..dc3cffe 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -63,8 +63,8 @@ #include "base/process.h" #include "base/shared_memory.h" #include "content/browser/browser_message_filter.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h" +#include "content/public/browser/browser_thread.h" #include "media/audio/audio_input_controller.h" #include "media/audio/audio_io.h" #include "media/audio/simple_sources.h" diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index d2308a5..2ec629f 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -61,8 +61,8 @@ #include "base/process.h" #include "base/shared_memory.h" #include "content/browser/browser_message_filter.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "media/audio/audio_io.h" #include "media/audio/audio_output_controller.h" #include "media/audio/simple_sources.h" diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc index cbf28f1..36b29e2 100644 --- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc +++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc @@ -8,11 +8,11 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/sync_socket.h" -#include "content/browser/browser_thread.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/media/audio_renderer_host.h" #include "content/browser/renderer_host/media/mock_media_observer.h" #include "content/common/media/audio_messages.h" +#include "content/test/test_browser_thread.h" #include "ipc/ipc_message_utils.h" #include "media/audio/audio_manager.h" #include "media/audio/fake_audio_output_stream.h" @@ -175,8 +175,10 @@ class AudioRendererHostTest : public testing::Test { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // Claim to be on both the UI and IO threads to pass all the DCHECKS. - io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get())); - ui_thread_.reset(new BrowserThread(BrowserThread::UI, message_loop_.get())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, + message_loop_.get())); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + message_loop_.get())); observer_.reset(new MockMediaObserver()); content::MockResourceContext* context = @@ -357,8 +359,8 @@ class AudioRendererHostTest : public testing::Test { scoped_ptr<MockMediaObserver> observer_; scoped_refptr<MockAudioRendererHost> host_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> io_thread_; - scoped_ptr<BrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest); }; diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc index 54834e8..3edaf39 100644 --- a/content/browser/renderer_host/media/media_stream_device_settings.cc +++ b/content/browser/renderer_host/media/media_stream_device_settings.cc @@ -6,9 +6,9 @@ #include "base/stl_util.h" #include "base/task.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_settings_requester.h" #include "content/common/media/media_stream_options.h" +#include "content/public/browser/browser_thread.h" namespace media_stream { diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index d9f7db7..a9afcee 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc @@ -13,6 +13,7 @@ #include "content/browser/resource_context.h" #include "content/common/media/media_stream_messages.h" #include "content/common/media/media_stream_options.h" +#include "content/test/test_browser_thread.h" #include "ipc/ipc_message_macros.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -141,9 +142,11 @@ class MediaStreamDispatcherHostTest : public testing::Test { virtual void SetUp() { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // ResourceContext must be created on UI thread. - ui_thread_.reset(new BrowserThread(BrowserThread::UI, message_loop_.get())); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + message_loop_.get())); // MediaStreamManager must be created and called on IO thread. - io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, + message_loop_.get())); // Create a MediaStreamManager instance and hand over pointer to // ResourceContext. @@ -193,8 +196,8 @@ class MediaStreamDispatcherHostTest : public testing::Test { scoped_refptr<MockMediaStreamDispatcherHost> host_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<MediaStreamManager> media_stream_manager_; }; diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index ce216b4..8c0a1130 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -9,12 +9,12 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/rand_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/audio_input_device_manager.h" #include "content/browser/renderer_host/media/media_stream_device_settings.h" #include "content/browser/renderer_host/media/media_stream_requester.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/common/media/media_stream_options.h" +#include "content/public/browser/browser_thread.h" namespace media_stream { diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index f30f2d5..286f7b4 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/stl_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/video_capture_manager.h" +#include "content/public/browser/browser_thread.h" #include "media/base/yuv_convert.h" // The number of TransportDIBs VideoCaptureController allocate. diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc index cd8ac06..3bf4de0 100644 --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc @@ -12,13 +12,13 @@ #include "base/process_util.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "content/browser/browser_thread.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/video_capture_host.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/browser/resource_context.h" #include "content/common/media/video_capture_messages.h" +#include "content/test/test_browser_thread.h" #include "media/video/capture/video_capture_types.h" #include "testing/gmock/include/gmock/gmock.h" @@ -195,10 +195,12 @@ class VideoCaptureHostTest : public testing::Test { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); // ResourceContext must be created on the UI thread. - ui_thread_.reset(new BrowserThread(BrowserThread::UI, message_loop_.get())); + ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI, + message_loop_.get())); // MediaStreamManager must be created on the IO thread. - io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, + message_loop_.get())); // Create a MediaStreamManager instance and hand over pointer to // ResourceContext. @@ -360,8 +362,8 @@ class VideoCaptureHostTest : public testing::Test { private: scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> ui_thread_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> ui_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest); diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc index 2143c91..3a7e87f 100644 --- a/content/browser/renderer_host/media/video_capture_manager.cc +++ b/content/browser/renderer_host/media/video_capture_manager.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "media/video/capture/fake_video_capture_device.h" #include "media/video/capture/video_capture_device.h" diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index e6ae7b2..1ec4991 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc @@ -10,10 +10,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_provider.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/common/media/media_stream_options.h" +#include "content/test/test_browser_thread.h" #include "media/video/capture/video_capture_device.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -82,7 +82,8 @@ class VideoCaptureManagerTest : public testing::Test { virtual void SetUp() { listener_.reset(new media_stream::MockMediaStreamProviderListener()); message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); - io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get())); + io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, + message_loop_.get())); vcm_.reset(new media_stream::VideoCaptureManager()); vcm_->UseFakeDevice(); vcm_->Register(listener_.get()); @@ -120,7 +121,7 @@ class VideoCaptureManagerTest : public testing::Test { scoped_ptr<media_stream::VideoCaptureManager> vcm_; scoped_ptr<media_stream::MockMediaStreamProviderListener> listener_; scoped_ptr<MessageLoop> message_loop_; - scoped_ptr<BrowserThread> io_thread_; + scoped_ptr<content::TestBrowserThread> io_thread_; scoped_ptr<MockFrameObserver> frame_observer_; private: diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc index 3b37cfc..b288975 100644 --- a/content/browser/renderer_host/pepper_file_message_filter.cc +++ b/content/browser/renderer_host/pepper_file_message_filter.cc @@ -10,10 +10,10 @@ #include "base/platform_file.h" #include "base/process_util.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/browser_render_process_host.h" #include "content/common/pepper_file_messages.h" +#include "content/public/browser/browser_thread.h" #include "ipc/ipc_platform_file.h" #include "webkit/plugins/ppapi/file_path.h" diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc index 3cc90ce..434a6d8 100644 --- a/content/browser/renderer_host/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper_message_filter.cc @@ -19,17 +19,17 @@ #include "base/process_util.h" #include "base/threading/worker_pool.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "content/browser/font_list_async.h" #include "content/browser/renderer_host/browser_render_process_host.h" #include "content/browser/resource_context.h" #include "content/common/pepper_messages.h" +#include "content/public/browser/browser_thread.h" #include "net/base/address_list.h" #include "net/base/cert_verifier.h" -#include "net/base/ip_endpoint.h" #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" +#include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/base/single_request_host_resolver.h" #include "net/base/ssl_config_service.h" diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 0ee35cd..9222836 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -14,7 +14,6 @@ #include "base/threading/worker_pool.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/download/download_stats.h" #include "content/browser/download/download_types.h" @@ -32,6 +31,7 @@ #include "content/common/child_process_messages.h" #include "content/common/desktop_notification_messages.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc index d9ce96b..251f3bb 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -8,11 +8,11 @@ #include "base/rand_util.h" #include "base/sys_info.h" #include "content/browser/browser_main.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/webui/web_ui_factory.h" #include "content/common/child_process_info.h" #include "content/common/content_constants.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/content/browser/renderer_host/render_view_host_notification_task.h b/content/browser/renderer_host/render_view_host_notification_task.h index d30c28b..c14f476 100644 --- a/content/browser/renderer_host/render_view_host_notification_task.h +++ b/content/browser/renderer_host/render_view_host_notification_task.h @@ -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. @@ -13,9 +13,9 @@ #include "base/callback_old.h" #include "base/task.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" +#include "content/public/browser/browser_thread.h" // ---------------------------------------------------------------------------- diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index cbfa094..18a95e6 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc @@ -6,11 +6,11 @@ #include "base/eintr_wrapper.h" #include "base/threading/thread.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" // A Task used with InvokeLater that we hold a pointer to in pending_paints_. // Instances are deleted by MessageLoop after it calls their Run method. diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 047e620..c5a5769 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -6,17 +6,17 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/timer.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/view_messages.h" +#include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" -#include "content/public/browser/content_browser_client.h" #include "content/test/test_browser_context.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/canvas_skia.h" @@ -527,7 +527,8 @@ TEST_F(RenderWidgetHostTest, GetBackingStore_RepaintAck) { // Test that we don't paint when we're hidden, but we still send the ACK. Most // of the rest of the painting is tested in the GetBackingStore* ones. TEST_F(RenderWidgetHostTest, HiddenPaint) { - BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current()); + content::TestBrowserThread ui_thread(BrowserThread::UI, + MessageLoop::current()); // Hide the widget, it should have sent out a message to the renderer. EXPECT_FALSE(host_->is_hidden_); host_->WasHidden(); diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 56f0c88..ed0ebac 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -11,14 +11,13 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #import "base/mac/scoped_nsautorelease_pool.h" -#include "base/metrics/histogram.h" #import "base/memory/scoped_nsobject.h" +#include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "content/browser/accessibility/browser_accessibility_cocoa.h" -#include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/gpu/gpu_process_host_ui_shim.h" #include "content/browser/mac/closure_blocks_leopard_compat.h" @@ -34,14 +33,15 @@ #include "content/common/gpu/gpu_messages.h" #include "content/common/plugin_messages.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/native_web_keyboard_event.h" #include "skia/ext/platform_canvas.h" -#import "third_party/mozilla/ComplexTextInputPanel.h" -#include "third_party/skia/include/core/SkColor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" +#import "third_party/mozilla/ComplexTextInputPanel.h" +#include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/point.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" #include "ui/gfx/surface/io_surface_support_mac.h" diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index c09939f..c6744fb 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -5,8 +5,8 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/test/cocoa_test_event_utils.h" #import "ui/base/test/ui_cocoa_test_helper.h" @@ -88,8 +88,9 @@ TEST_F(RenderWidgetHostViewMacTest, Basic) { // Regression test for http://crbug.com/60318 TEST_F(RenderWidgetHostViewMacTest, FocusAcceleratedView) { // The accelerated view methods want to be called on the UI thread. - scoped_ptr<BrowserThread> ui_thread_( - new BrowserThread(BrowserThread::UI, MessageLoop::current())); + scoped_ptr<content::TestBrowserThread> ui_thread_( + new content::TestBrowserThread(BrowserThread::UI, + MessageLoop::current())); int w = 400, h = 300; gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h); @@ -160,8 +161,9 @@ TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDown) { // Regression test for http://crbug.com/64256 TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDownWithAcceleratedView) { // The accelerated view methods want to be called on the UI thread. - scoped_ptr<BrowserThread> ui_thread_( - new BrowserThread(BrowserThread::UI, MessageLoop::current())); + scoped_ptr<content::TestBrowserThread> ui_thread_( + new content::TestBrowserThread(BrowserThread::UI, + MessageLoop::current())); int w = 400, h = 300; gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h); diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 340daad..6a7bf48 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -19,7 +19,6 @@ #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/accessibility/browser_accessibility_state.h" #include "content/browser/accessibility/browser_accessibility_win.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/backing_store_win.h" @@ -27,6 +26,7 @@ #include "content/browser/renderer_host/render_widget_host.h" #include "content/common/plugin_messages.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc index 1b57703..919674f 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc @@ -10,7 +10,6 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/download/download_id.h" #include "content/browser/mock_resource_context.h" @@ -23,6 +22,7 @@ #include "content/common/resource_messages.h" #include "content/common/resource_response.h" #include "content/common/view_messages.h" +#include "content/test/test_browser_thread.h" #include "net/base/net_errors.h" #include "net/base/upload_data.h" #include "net/http/http_util.h" @@ -385,8 +385,8 @@ class ResourceDispatcherHostTest : public testing::Test, } MessageLoopForIO message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<ForwardingFilter> filter_; ResourceDispatcherHost host_; ResourceIPCAccumulator accum_; diff --git a/content/browser/renderer_host/resource_handler.h b/content/browser/renderer_host/resource_handler.h index 838f887..7fca15a 100644 --- a/content/browser/renderer_host/resource_handler.h +++ b/content/browser/renderer_host/resource_handler.h @@ -15,7 +15,7 @@ #include <string> -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace net { class IOBuffer; diff --git a/content/browser/renderer_host/resource_message_filter.cc b/content/browser/renderer_host/resource_message_filter.cc index 889a1c0..ba5b7c4 100644 --- a/content/browser/renderer_host/resource_message_filter.cc +++ b/content/browser/renderer_host/resource_message_filter.cc @@ -4,9 +4,9 @@ #include "content/browser/renderer_host/resource_message_filter.h" -#include "content/browser/browser_thread.h" -#include "content/browser/resource_context.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/resource_context.h" +#include "content/public/browser/browser_thread.h" ResourceMessageFilter::ResourceMessageFilter( int child_id, diff --git a/content/browser/renderer_host/resource_queue.cc b/content/browser/renderer_host/resource_queue.cc index 681c8ac..8821425 100644 --- a/content/browser/renderer_host/resource_queue.cc +++ b/content/browser/renderer_host/resource_queue.cc @@ -5,9 +5,9 @@ #include "content/browser/renderer_host/resource_queue.h" #include "base/stl_util.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/public/browser/browser_thread.h" ResourceQueueDelegate::~ResourceQueueDelegate() { } diff --git a/content/browser/renderer_host/resource_queue_unittest.cc b/content/browser/renderer_host/resource_queue_unittest.cc index c743573..cc48914 100644 --- a/content/browser/renderer_host/resource_queue_unittest.cc +++ b/content/browser/renderer_host/resource_queue_unittest.cc @@ -4,12 +4,12 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "content/browser/browser_thread.h" #include "content/browser/mock_resource_context.h" #include "content/browser/renderer_host/dummy_resource_handler.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/renderer_host/resource_queue.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" #include "testing/gtest/include/gtest/gtest.h" @@ -123,8 +123,8 @@ class ResourceQueueTest : public testing::Test, private: MessageLoop message_loop_; - BrowserThread ui_thread_; - BrowserThread io_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread io_thread_; }; TEST_F(ResourceQueueTest, Basic) { diff --git a/content/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm index 927a714..44824cb 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.mm +++ b/content/browser/renderer_host/text_input_client_message_filter.mm @@ -6,11 +6,11 @@ #include "base/memory/scoped_nsobject.h" #include "base/string16.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/renderer_host/text_input_client_mac.h" #include "content/common/text_input_client_messages.h" +#include "content/public/browser/browser_thread.h" #include "ipc/ipc_message_macros.h" #include "ui/base/range/range.h" #include "ui/gfx/rect.h" diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index 91f35c1..b700f58 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -5,6 +5,7 @@ #include "content/browser/resolve_proxy_msg_helper.h" #include "content/common/view_messages.h" +#include "content/test/test_browser_thread.h" #include "ipc/ipc_test_sink.h" #include "net/base/net_errors.h" #include "net/proxy/mock_proxy_resolver.h" @@ -77,7 +78,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, } MessageLoop message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; IPC::TestSink test_sink_; }; diff --git a/content/browser/resource_context.cc b/content/browser/resource_context.cc index 552ed1e..d59f6b1 100644 --- a/content/browser/resource_context.cc +++ b/content/browser/resource_context.cc @@ -5,8 +5,8 @@ #include "content/browser/resource_context.h" #include "base/logging.h" -#include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" +#include "content/public/browser/browser_thread.h" #include "webkit/database/database_tracker.h" namespace content { diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index 50cc712..d19ef68 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -5,7 +5,6 @@ #include "base/compiler_specific.h" #include "base/stl_util.h" #include "base/string16.h" -#include "content/browser/browser_thread.h" #include "content/browser/browsing_instance.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/mock_content_browser_client.h" @@ -20,6 +19,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" #include "content/test/test_browser_context.h" +#include "content/test/test_browser_thread.h" #include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -115,7 +115,7 @@ class SiteInstanceTest : public testing::Test { private: MessageLoopForUI message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; SiteInstanceTestBrowserClient browser_client_; content::ContentBrowserClient* old_browser_client_; diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc index ac1037b..2019b6e 100644 --- a/content/browser/speech/speech_input_manager.cc +++ b/content/browser/speech/speech_input_manager.cc @@ -5,8 +5,8 @@ #include "content/browser/speech/speech_input_manager.h" #include "base/bind.h" -#include "content/browser/browser_thread.h" #include "content/browser/speech/speech_input_preferences.h" +#include "content/public/browser/browser_thread.h" #include "media/audio/audio_manager.h" namespace speech_input { diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc index f045e6f..4ee9421 100644 --- a/content/browser/speech/speech_recognizer.cc +++ b/content/browser/speech/speech_recognizer.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/time.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/url_request/url_request_context_getter.h" using media::AudioInputController; diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc index 9b1bbc2..9ffb08b 100644 --- a/content/browser/speech/speech_recognizer_unittest.cc +++ b/content/browser/speech/speech_recognizer_unittest.cc @@ -4,8 +4,8 @@ #include <vector> -#include "content/browser/browser_thread.h" #include "content/browser/speech/speech_recognizer.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_url_fetcher_factory.h" #include "media/audio/test_audio_input_controller_factory.h" #include "net/base/net_errors.h" @@ -106,7 +106,7 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate, protected: MessageLoopForIO message_loop_; - BrowserThread io_thread_; + content::TestBrowserThread io_thread_; scoped_refptr<SpeechRecognizer> recognizer_; bool recording_complete_; bool recognition_complete_; diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 74e52c5..f78636e 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc @@ -5,10 +5,10 @@ #include "content/browser/ssl/ssl_client_auth_handler.h" #include "base/bind.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/browser/ssl/ssl_client_auth_notification_details.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" #include "net/base/x509_certificate.h" diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index f5a0997..019ffaf 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "net/base/ssl_cert_request_info.h" diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc index 8771996..8fb462a 100644 --- a/content/browser/ssl/ssl_error_handler.cc +++ b/content/browser/ssl/ssl_error_handler.cc @@ -5,13 +5,13 @@ #include "content/browser/ssl/ssl_error_handler.h" #include "base/bind.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index f4abf54..17f2239 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/load_from_memory_cache_details.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" @@ -18,6 +17,7 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/provisional_load_details.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "net/base/cert_status_flags.h" diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index 3a8568b..8da9525 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -11,7 +11,6 @@ #include "base/string_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" @@ -22,9 +21,10 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/dom_storage_common.h" -#include "content/public/browser/notification_service.h" #include "content/common/view_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/page_transition_types.h" diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc index a22b800..4dc9cf8 100644 --- a/content/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc @@ -4,7 +4,6 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/browser_url_handler.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" @@ -17,6 +16,8 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/common/page_transition_types.h" +#include "content/test/test_browser_thread.h" +#include "content/test/test_browser_thread.h" #include "content/test/test_notification_tracker.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/webkit_glue.h" @@ -60,7 +61,8 @@ class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness { // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is // a regression test for bug 9364. TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) { - BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current()); + content::TestBrowserThread ui_thread(BrowserThread::UI, + MessageLoop::current()); const GURL kNtpUrl(chrome::kTestNewTabURL); const GURL kDestUrl("http://www.google.com/"); @@ -119,7 +121,8 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) { // EnableViewSourceMode message is sent on every navigation regardless // RenderView is being newly created or reused. TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) { - BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current()); + content::TestBrowserThread ui_thread(BrowserThread::UI, + MessageLoop::current()); const GURL kNtpUrl(chrome::kTestNewTabURL); const GURL kUrl("view-source:http://foo"); @@ -271,7 +274,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) { // Tests WebUI creation. TEST_F(RenderViewHostManagerTest, WebUI) { - BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current()); + content::TestBrowserThread ui_thread(BrowserThread::UI, + MessageLoop::current()); SiteInstance* instance = SiteInstance::CreateSiteInstance(profile()); TestTabContents tab_contents(profile(), instance); @@ -311,7 +315,7 @@ TEST_F(RenderViewHostManagerTest, WebUI) { // still swap processes if ShouldSwapProcessesForNavigation is true. // Regression test for bug 46290. TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) { - BrowserThread thread(BrowserThread::UI, &message_loop_); + content::TestBrowserThread thread(BrowserThread::UI, &message_loop_); SiteInstance* instance = SiteInstance::CreateSiteInstance(profile()); TestTabContents tab_contents(profile(), instance); RenderViewHostManager manager(&tab_contents, &tab_contents); diff --git a/content/browser/tab_contents/web_drag_source_mac.mm b/content/browser/tab_contents/web_drag_source_mac.mm index 04c17d8..35d0d6f 100644 --- a/content/browser/tab_contents/web_drag_source_mac.mm +++ b/content/browser/tab_contents/web_drag_source_mac.mm @@ -13,7 +13,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/download/drag_download_file.h" #include "content/browser/download/drag_download_util.h" #include "content/browser/renderer_host/render_view_host.h" diff --git a/content/browser/user_metrics.cc b/content/browser/user_metrics.cc index d58c666..8191418 100644 --- a/content/browser/user_metrics.cc +++ b/content/browser/user_metrics.cc @@ -4,7 +4,7 @@ #include "content/browser/user_metrics.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_types.h" diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h index 52f4fff..23d749a 100644 --- a/content/browser/utility_process_host.h +++ b/content/browser/utility_process_host.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/process_util.h" #include "content/browser/browser_child_process_host.h" -#include "content/browser/browser_thread.h" #include "content/common/content_export.h" +#include "content/public/browser/browser_thread.h" // This class acts as the browser-side host to a utility child process. A // utility process is a short-lived sandboxed process that is created to run diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index 228cd7b..2eabbeb 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -16,7 +16,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/browser/appcache/appcache_dispatcher_host.h" -#include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/debugger/worker_devtools_message_filter.h" #include "content/browser/file_system/file_system_dispatcher_host.h" @@ -35,11 +34,12 @@ #include "content/common/debug_flags.h" #include "content/common/view_messages.h" #include "content/common/worker_messages.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" -#include "net/base/mime_util.h" #include "ipc/ipc_switches.h" +#include "net/base/mime_util.h" #include "net/base/registry_controlled_domain.h" #include "ui/base/ui_base_switches.h" #include "webkit/fileapi/file_system_context.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 9d3f8e4..f6667c3 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -59,8 +59,8 @@ 'browser/browser_message_filter.h', 'browser/browser_process_sub_thread.cc', 'browser/browser_process_sub_thread.h', - 'browser/browser_thread.cc', - 'browser/browser_thread.h', + 'browser/browser_thread_impl.cc', + 'browser/browser_thread_impl.h', 'browser/browser_url_handler.cc', 'browser/browser_url_handler.h', 'browser/browsing_instance.cc', @@ -576,6 +576,7 @@ 'browser/zygote_host_linux.h', 'browser/zygote_main_linux.cc', 'public/browser/browser_main_parts.h', + 'public/browser/browser_thread.h', 'public/browser/content_browser_client.h', 'public/browser/download_manager_delegate.h', 'public/browser/native_web_keyboard_event.h', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index c8fb0eb..d0238e4 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -75,6 +75,8 @@ 'test/render_view_test.h', 'test/test_browser_context.cc', 'test/test_browser_context.h', + 'test/test_browser_thread.cc', + 'test/test_browser_thread.h', 'test/test_content_client.cc', 'test/test_content_client.h', 'test/test_notification_tracker.cc', diff --git a/content/browser/browser_thread.h b/content/public/browser/browser_thread.h index 2e79897..7515939 100644 --- a/content/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_BROWSER_THREAD_H_ -#define CONTENT_BROWSER_BROWSER_THREAD_H_ +#ifndef CONTENT_PUBLIC_BROWSER_BROWSER_THREAD_H_ +#define CONTENT_PUBLIC_BROWSER_BROWSER_THREAD_H_ #pragma once #include "base/callback.h" @@ -20,12 +20,20 @@ namespace base { class MessageLoopProxy; } +namespace content { +class BrowserThreadImpl; +} + +class DeprecatedBrowserThread; + /////////////////////////////////////////////////////////////////////////////// // BrowserThread // -// This class represents a thread that is known by a browser-wide name. For -// example, there is one IO thread for the entire browser process, and various -// pieces of code find it useful to retrieve a pointer to the IO thread's +// Utility functions for threads that are known by a browser-wide +// name. For example, there is one IO thread for the entire browser +// process, and various pieces of code find it useful to retrieve a +// pointer to the IO thread's message loop. +// // Invoke a task by thread ID: // // BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task); @@ -81,16 +89,6 @@ class CONTENT_EXPORT BrowserThread : public base::Thread { ID_COUNT }; - // Construct a BrowserThread with the supplied identifier. It is an error - // to construct a BrowserThread that already exists. - explicit BrowserThread(ID identifier); - - // Special constructor for the main (UI) thread and unittests. We use a dummy - // thread here since the main thread already exists. - BrowserThread(ID identifier, MessageLoop* message_loop); - - virtual ~BrowserThread(); - // These are the same methods in message_loop.h, but are guaranteed to either // get posted to the MessageLoop if it's still alive, or be deleted otherwise. // They return true iff the thread existed and the task was posted. Note that @@ -216,36 +214,40 @@ class CONTENT_EXPORT BrowserThread : public base::Thread { struct DeleteOnWebKitThread : public DeleteOnThread<WEBKIT> { }; private: + // Construct a BrowserThread with the supplied identifier. It is an error + // to construct a BrowserThread that already exists. + explicit BrowserThread(ID identifier); + + // Special constructor for the main (UI) thread and unittests. We use a dummy + // thread here since the main thread already exists. + BrowserThread(ID identifier, MessageLoop* message_loop); + + virtual ~BrowserThread(); + // Common initialization code for the constructors. void Initialize(); - // TODO(brettw) remove this variant when Task->Closure migration is complete. - static bool PostTaskHelper( - ID identifier, - const tracked_objects::Location& from_here, - Task* task, - int64 delay_ms, - bool nestable); - static bool PostTaskHelper( - ID identifier, - const tracked_objects::Location& from_here, - const base::Closure& task, - int64 delay_ms, - bool nestable); + // Constructors are only available through this subclass. + friend class content::BrowserThreadImpl; + + // TODO(joi): Remove. + friend class DeprecatedBrowserThread; // The identifier of this thread. Only one thread can exist with a given // identifier at a given time. + // TODO(joi): Move to BrowserThreadImpl, and make constructors here + // do-nothing. ID identifier_; +}; - // This lock protects |browser_threads_|. Do not read or modify that array - // without holding this lock. Do not block while holding this lock. - static base::Lock lock_; - - // An array of the BrowserThread objects. This array is protected by |lock_|. - // The threads are not owned by this array. Typically, the threads are owned - // on the UI thread by the g_browser_process object. BrowserThreads remove - // themselves from this array upon destruction. - static BrowserThread* browser_threads_[ID_COUNT]; +// Temporary escape hatch for chrome/ to construct BrowserThread, +// until we make content/ construct its own threads. +class DeprecatedBrowserThread : public BrowserThread { + public: + explicit DeprecatedBrowserThread(BrowserThread::ID identifier); + DeprecatedBrowserThread(BrowserThread::ID identifier, + MessageLoop* message_loop); + virtual ~DeprecatedBrowserThread(); }; -#endif // CONTENT_BROWSER_BROWSER_THREAD_H_ +#endif // CONTENT_PUBLIC_BROWSER_BROWSER_THREAD_H_ diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc index 561382e..94ab2f1 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/shell_browser_context.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "content/browser/appcache/chrome_appcache_service.h" -#include "content/browser/browser_thread.h" #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/download/download_manager.h" #include "content/browser/download/download_status_updater.h" @@ -16,8 +15,9 @@ #include "content/browser/geolocation/geolocation_permission_context.h" #include "content/browser/host_zoom_map.h" #include "content/browser/in_process_webkit/webkit_context.h" -#include "content/browser/ssl/ssl_host_state.h" #include "content/browser/speech/speech_input_preferences.h" +#include "content/browser/ssl/ssl_host_state.h" +#include "content/public/browser/browser_thread.h" #include "content/shell/shell_browser_main.h" #include "content/shell/shell_download_manager_delegate.h" #include "content/shell/shell_resource_context.h" diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/shell_download_manager_delegate.cc index 3b14c89..1d6ec99 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/shell_download_manager_delegate.cc @@ -15,10 +15,10 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_context.h" -#include "content/browser/browser_thread.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/download/download_manager.h" #include "content/browser/download/download_state_info.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index a6ba692..52c6683 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -6,17 +6,17 @@ #include "base/logging.h" #include "base/string_split.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/default_origin_bound_cert_store.h" #include "net/base/dnsrr_resolver.h" #include "net/base/host_resolver.h" -#include "net/http/http_auth_handler_factory.h" -#include "net/http/http_server_properties_impl.h" -#include "net/http/http_cache.h" #include "net/base/origin_bound_cert_service.h" #include "net/base/ssl_config_service_defaults.h" +#include "net/http/http_auth_handler_factory.h" +#include "net/http/http_cache.h" +#include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" diff --git a/content/test/test_browser_thread.cc b/content/test/test_browser_thread.cc new file mode 100644 index 0000000..002a93f --- /dev/null +++ b/content/test/test_browser_thread.cc @@ -0,0 +1,20 @@ +// 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. + +#include "content/test/test_browser_thread.h" + +namespace content { + +TestBrowserThread::TestBrowserThread(ID identifier) + : BrowserThreadImpl(identifier) { +} + +TestBrowserThread::TestBrowserThread(ID identifier, MessageLoop* message_loop) + : BrowserThreadImpl(identifier, message_loop) { +} + +TestBrowserThread::~TestBrowserThread() { +} + +} // namespace content diff --git a/content/test/test_browser_thread.h b/content/test/test_browser_thread.h new file mode 100644 index 0000000..1067f9e --- /dev/null +++ b/content/test/test_browser_thread.h @@ -0,0 +1,24 @@ +// 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. + +#ifndef CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_ +#define CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_ +#pragma once + +#include "content/browser/browser_thread_impl.h" + +namespace content { + +// A BrowserThread for unit tests; this lets unit tests in chrome/ +// create BrowserThread instances. +class TestBrowserThread : public BrowserThreadImpl { + public: + explicit TestBrowserThread(ID identifier); + TestBrowserThread(ID identifier, MessageLoop* message_loop); + virtual ~TestBrowserThread(); +}; + +} // namespace content + +#endif // CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_ diff --git a/content/test/test_url_fetcher_factory.h b/content/test/test_url_fetcher_factory.h index fc1bfdb..3b64324 100644 --- a/content/test/test_url_fetcher_factory.h +++ b/content/test/test_url_fetcher_factory.h @@ -38,7 +38,7 @@ class ScopedURLFetcherFactory : public base::NonThreadSafe { // // TestURLFetcher requires a MessageLoop: // MessageLoopForUI message_loop; // // And io_thread to release URLRequestContextGetter in URLFetcher::Core. -// BrowserThread io_thread(BrowserThread::IO, &message_loop); +// BrowserThreadImpl io_thread(BrowserThread::IO, &message_loop); // // Create factory (it automatically sets itself as URLFetcher's factory). // TestURLFetcherFactory factory; // // Do something that triggers creation of a URLFetcher. |