Switch content tests to use BrowserThreadImpl directly.

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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/renderer_host/render_widget_host_view_mac.h"
 
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/test/cocoa_test_event_utils.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
 class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness {
  public:
   RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {}
 
   virtual void SetUp() {
@@ skipping 61 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMacTest);
 };
 
 TEST_F(RenderWidgetHostViewMacTest, Basic) {
 }
 
 // Regression test for http://crbug.com/60318
 TEST_F(RenderWidgetHostViewMacTest, FocusAcceleratedView) {
   // The accelerated view methods want to be called on the UI thread.
-  scoped_ptr<content::TestBrowserThread> ui_thread_(
-      new content::TestBrowserThread(BrowserThread::UI,
+  scoped_ptr<content::BrowserThreadImpl> ui_thread_(

[jam, 2011/10/28 17:00:21]

add using in this file?

[Jói, 2011/10/31 15:13:15]

Done.

+      new content::BrowserThreadImpl(BrowserThread::UI,
                                      MessageLoop::current()));
 
   int w = 400, h = 300;
   gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h);
   EXPECT_FALSE([rwhv_cocoa_.get() isHidden]);
   NSView* accelerated_view = static_cast<NSView*>(
       rwhv_mac_->ViewForPluginWindowHandle(accelerated_handle));
   EXPECT_FALSE([accelerated_view isHidden]);
 
   // Take away first responder from the rwhvmac, then simulate the effect of a
@@ skipping 51 matching lines @@
 
   std::pair<NSEvent*, NSEvent*> clicks =
       cocoa_test_event_utils::MouseClickInView(rwhv_cocoa_.get(), 1);
   [rwhv_cocoa_.get() mouseDown:clicks.first];
   EXPECT_EQ(rwhv_cocoa_.get(), [window firstResponder]);
 }
 
 // Regression test for http://crbug.com/64256
 TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDownWithAcceleratedView) {
   // The accelerated view methods want to be called on the UI thread.
-  scoped_ptr<content::TestBrowserThread> ui_thread_(
-      new content::TestBrowserThread(BrowserThread::UI,
+  scoped_ptr<content::BrowserThreadImpl> ui_thread_(
+      new content::BrowserThreadImpl(BrowserThread::UI,
                                      MessageLoop::current()));
 
   int w = 400, h = 300;
   gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h);
   EXPECT_FALSE([rwhv_cocoa_.get() isHidden]);
   NSView* accelerated_view = static_cast<NSView*>(
       rwhv_mac_->ViewForPluginWindowHandle(accelerated_handle));
   EXPECT_FALSE([accelerated_view isHidden]);
 
   // Add the RWHVCocoa to the window and remove first responder status.
@@ skipping 11 matching lines @@
 
   // A click on the accelerated view should focus the RWHVCocoa.
   std::pair<NSEvent*, NSEvent*> clicks =
       cocoa_test_event_utils::MouseClickInView(accelerated_view, 1);
   [rwhv_cocoa_.get() mouseDown:clicks.first];
   EXPECT_EQ(rwhv_cocoa_.get(), [window firstResponder]);
 
   // Clean up.
   rwhv_mac_->DestroyFakePluginWindowHandle(accelerated_handle);
 }