Salient parts of http://codereview.chromium.org/8392042/

content/browser/browser_process_sub_thread.h

Index: content/browser/browser_process_sub_thread.h
diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h
index adbda9721196130e74b9a442abcb2c519c795950..ac3f856071aa6877ceaec5702eac9595b8301620 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_