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

content/browser/plugin_loader_posix_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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/memory/ref_counted.h"
 #include "base/utf_string_conversions.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 "testing/gmock/include/gmock/gmock.h"
 #include "webkit/plugins/webplugininfo.h"
 
 class MockPluginLoaderPosix : public PluginLoaderPosix {
  public:
   MOCK_METHOD0(LoadPluginsInternal, void(void));
 
   size_t number_of_pending_callbacks() {
     return callbacks_.size();
   }
 
@@ skipping 50 matching lines @@
     plugin_loader_->canonical_list()->push_back(plugin3_.path);
   }
 
   // Data used for testing.
   webkit::WebPluginInfo plugin1_;
   webkit::WebPluginInfo plugin2_;
   webkit::WebPluginInfo plugin3_;
 
  private:
   MessageLoopForIO message_loop_;
-  BrowserThread file_thread_;
-  BrowserThread io_thread_;
+  content::TestBrowserThread file_thread_;
+  content::TestBrowserThread io_thread_;
 
   scoped_refptr<MockPluginLoaderPosix> plugin_loader_;
 };
 
 TEST_F(PluginLoaderPosixTest, QueueRequests) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
   EXPECT_EQ(0u, plugin_loader()->number_of_pending_callbacks());
@@ skipping 172 matching lines @@
   message_loop()->RunAllPending();
   EXPECT_EQ(0, did_callback);
 
   plugin_loader()->TestOnPluginLoaded(plugin3_);
   EXPECT_EQ(3u, plugins.size());
   EXPECT_EQ(plugin3_.name, plugins[2].name);
 
   message_loop()->RunAllPending();
   EXPECT_EQ(1, did_callback);
 }