Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

Issue 8400060: Switch content tests to use BrowserThreadImpl directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to lkgr Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
index c6744fb4a45e7dd012413522a7bd4ba83c39f0ec..83eb175a98799c88daf3c3f2983f9aa8f1f4dd2a 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -5,13 +5,15 @@
#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"
+using content::BrowserThreadImpl;
+
class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness {
public:
RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {}
@@ -88,9 +90,9 @@ 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,
- MessageLoop::current()));
+ scoped_ptr<BrowserThreadImpl> ui_thread_(
+ new BrowserThreadImpl(BrowserThread::UI,
+ MessageLoop::current()));
int w = 400, h = 300;
gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h);
@@ -161,9 +163,9 @@ TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDown) {
// 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,
- MessageLoop::current()));
+ scoped_ptr<BrowserThreadImpl> ui_thread_(
+ new BrowserThreadImpl(BrowserThread::UI,
+ MessageLoop::current()));
int w = 400, h = 300;
gfx::PluginWindowHandle accelerated_handle = AddAcceleratedPluginView(w, h);

Powered by Google App Engine
This is Rietveld 408576698