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

content/browser/browser_thread_unittest.cc

 // 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 "base/bind.h"
 #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 {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask);
   }
 
  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();
   }
 
   virtual void TearDown() {
     ui_thread_->Stop();
     file_thread_->Stop();
   }
 
   static void BasicFunction(MessageLoop* message_loop) {
@@ skipping 38 matching lines @@
   class NeverDeleted
       : public base::RefCountedThreadSafe<
             NeverDeleted, BrowserThread::DeleteOnWebKitThread> {
    public:
     ~NeverDeleted() {
       CHECK(false);
     }
   };
 
  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_;
 };
 
 TEST_F(BrowserThreadTest, PostTask) {
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&BasicFunction, MessageLoop::current()));
   MessageLoop::current()->Run();
@@ skipping 55 matching lines @@
 
 TEST_F(BrowserThreadTest, TaskToNonExistentThreadIsDeletedViaMessageLoopProxy) {
   bool deleted = false;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::WEBKIT);
   message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
   EXPECT_TRUE(deleted);
 }
 
 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();
 
   bool deleted = false;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   bool ret = message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
   EXPECT_FALSE(ret);
   EXPECT_TRUE(deleted);
 }
 
 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;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   bool ret = message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
   EXPECT_FALSE(ret);
   EXPECT_TRUE(deleted);
 }
+
+}