Move BrowserThread to content namespace.

TBR=owners
BUG=98716

Review URL: http://codereview.chromium.org/8437002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108270 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 27 insertions, 9 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index db8f052..ce93a20 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -103,6 +103,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
+using content::BrowserThread;
 using WebKit::WebFindOptions;
 using base::Time;
 
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index c082065..2ad3b64 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -85,8 +85,8 @@ class AutomationProvider
     : public IPC::Channel::Listener,
       public IPC::Message::Sender,
       public base::SupportsWeakPtr<AutomationProvider>,
-      public base::RefCountedThreadSafe<AutomationProvider,
-                                        BrowserThread::DeleteOnUIThread>,
+      public base::RefCountedThreadSafe<
+          AutomationProvider, content::BrowserThread::DeleteOnUIThread>,
       public TraceSubscriber {
  public:
   explicit AutomationProvider(Profile* profile);
@@ -163,7 +163,8 @@ class AutomationProvider
       const DownloadItem* download);
 
  protected:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<AutomationProvider>;
   virtual ~AutomationProvider();
 
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index ca64410..c9be799 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -82,6 +82,8 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 
+using content::BrowserThread;
+
 // Holds onto start and stop timestamps for a particular tab
 class InitialLoadObserver::TabTime {
  public:
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index ad51f80..6a42122 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -1241,7 +1241,7 @@ class AutomationProviderGetPasswordsObserver : public PasswordStoreConsumer {
 class PasswordStoreLoginsChangedObserver
     : public base::RefCountedThreadSafe<
           PasswordStoreLoginsChangedObserver,
-          BrowserThread::DeleteOnUIThread>,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   PasswordStoreLoginsChangedObserver(AutomationProvider* automation,
@@ -1259,7 +1259,8 @@ class PasswordStoreLoginsChangedObserver
                        const content::NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<PasswordStoreLoginsChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
@@ -1464,7 +1465,7 @@ class AutofillDisplayedObserver : public content::NotificationObserver {
 class AutofillChangedObserver
     : public base::RefCountedThreadSafe<
           AutofillChangedObserver,
-          BrowserThread::DeleteOnUIThread>,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   AutofillChangedObserver(AutomationProvider* automation,
@@ -1482,7 +1483,8 @@ class AutofillChangedObserver
                        const content::NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<AutofillChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
@@ -1712,13 +1714,14 @@ class NewTabObserver : public content::NotificationObserver {
 class WaitForProcessLauncherThreadToGoIdleObserver
     : public base::RefCountedThreadSafe<
           WaitForProcessLauncherThreadToGoIdleObserver,
-          BrowserThread::DeleteOnUIThread> {
+          content::BrowserThread::DeleteOnUIThread> {
  public:
   WaitForProcessLauncherThreadToGoIdleObserver(
       AutomationProvider* automation, IPC::Message* reply_message);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<WaitForProcessLauncherThreadToGoIdleObserver>;
 
   virtual ~WaitForProcessLauncherThreadToGoIdleObserver();
diff --git a/chrome/browser/automation/automation_provider_unittest.cc b/chrome/browser/automation/automation_provider_unittest.cc
index d4dd565..c29e5b5 100644
--- a/chrome/browser/automation/automation_provider_unittest.cc
+++ b/chrome/browser/automation/automation_provider_unittest.cc
@@ -8,6 +8,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class MockChromeFrameAutomationProvider
     : public ChromeFrameAutomationProvider {
  public:
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index 771d3ab..ec5ae69 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -21,6 +21,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_filter.h"
 
+using content::BrowserThread;
+
 base::LazyInstance<AutomationResourceMessageFilter::RenderViewMap>
     AutomationResourceMessageFilter::filtered_render_views_(
         base::LINKER_INITIALIZED);
diff --git a/chrome/browser/automation/automation_tab_helper_unittest.cc b/chrome/browser/automation/automation_tab_helper_unittest.cc
index d858a2c..11056ea 100644
--- a/chrome/browser/automation/automation_tab_helper_unittest.cc
+++ b/chrome/browser/automation/automation_tab_helper_unittest.cc
@@ -15,6 +15,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 
 class AutomationTabHelperTest : public TabContentsWrapperTestHarness {
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 00b2a27..4bb707d 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -27,6 +27,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void GetCookiesCallback(base::WaitableEvent* event,
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index b7a2f89..c4f0dfa 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -140,6 +140,7 @@
 #endif
 
 using automation_util::SendErrorIfModalDialogActive;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/automation/ui_controls_mac.mm b/chrome/browser/automation/ui_controls_mac.mm
index f3f8b83..41a4fdd 100644
--- a/chrome/browser/automation/ui_controls_mac.mm
+++ b/chrome/browser/automation/ui_controls_mac.mm
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/keycodes/keyboard_code_conversion_mac.h"
 
+using content::BrowserThread;
+
 // Implementation details: We use [NSApplication sendEvent:] instead
 // of [NSApplication postEvent:atStart:] so that the event gets sent
 // immediately.  This lets us run the post-event task right
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 365da8d..8ddd479 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -25,6 +25,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 // The list of filtered headers that are removed from requests sent via
 // StartAsync(). These must be lower case.