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

Unified Diff: ash/wm/ash_native_cursor_manager_interactive_uitest.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: cleanup Created 6 years, 9 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: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
===================================================================
--- ash/wm/ash_native_cursor_manager_interactive_uitest.cc (revision 257128)
+++ ash/wm/ash_native_cursor_manager_interactive_uitest.cc (working copy)
@@ -12,6 +12,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/gl/gl_surface.h"
#if defined(USE_X11)
#include <X11/Xlib.h>
@@ -22,8 +23,18 @@
namespace ash {
using views::corewm::CursorManager;
-typedef test::AshTestBase AshNativeCursorManagerTest;
+class AshNativeCursorManagerTest : public test::AshTestBase {
+ public:
+ AshNativeCursorManagerTest() {}
+ virtual ~AshNativeCursorManagerTest() {}
+
+ virtual void SetUp() OVERRIDE {
+ gfx::GLSurface::InitializeOneOffForTests();
+ test::AshTestBase::SetUp();
+ }
+};
+
namespace {
internal::DisplayInfo CreateDisplayInfo(int64 id,

Powered by Google App Engine
This is Rietveld 408576698