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

Unified Diff: ash/drag_drop/drag_drop_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
« no previous file with comments | « no previous file | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | base/i18n/icu_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_interactive_uitest.cc
===================================================================
--- ash/drag_drop/drag_drop_interactive_uitest.cc (revision 257128)
+++ ash/drag_drop/drag_drop_interactive_uitest.cc (working copy)
@@ -12,6 +12,7 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/gl/gl_surface.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -118,8 +119,17 @@
} // namespace
-typedef test::AshTestBase DragDropTest;
+class DragDropTest : public test::AshTestBase {
+ public:
+ DragDropTest() {}
+ virtual ~DragDropTest() {}
+ virtual void SetUp() OVERRIDE {
+ gfx::GLSurface::InitializeOneOffForTests();
sky 2014/03/14 21:35:56 Is there a reason you don't want to move this to A
jam 2014/03/14 22:35:40 yeah, it won't work because this test base class r
+ test::AshTestBase::SetUp();
+ }
+};
+
#if defined(OS_WIN)
#define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay
#else
« no previous file with comments | « no previous file | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | base/i18n/icu_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698