From c38831a108f9f905ce9e68503ee67274939cc950 Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Fri, 28 Oct 2011 12:44:49 +0000 Subject: 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 --- chrome/browser/importer/external_process_importer_client.cc | 2 +- chrome/browser/importer/external_process_importer_client.h | 2 +- chrome/browser/importer/firefox3_importer.cc | 2 +- chrome/browser/importer/importer_host.cc | 2 +- chrome/browser/importer/importer_list.h | 7 +------ chrome/browser/importer/importer_unittest.cc | 6 +++--- chrome/browser/importer/in_process_importer_bridge.cc | 2 +- chrome/browser/importer/toolbar_importer.cc | 2 +- chrome/browser/importer/toolbar_importer_utils.cc | 2 +- 9 files changed, 11 insertions(+), 16 deletions(-) (limited to 'chrome/browser/importer') 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 { 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 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" -- cgit v1.1