Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

ui/views/corewm/desktop_capture_controller_unittest.cc

Index: ui/views/corewm/desktop_capture_controller_unittest.cc
===================================================================
--- ui/views/corewm/desktop_capture_controller_unittest.cc	(revision 257128)
+++ ui/views/corewm/desktop_capture_controller_unittest.cc	(working copy)
@@ -5,11 +5,15 @@
 #include "ui/wm/core/capture_controller.h"
 
 #include "base/logging.h"
+#include "base/path_service.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 #include "ui/events/event.h"
+#include "ui/gl/gl_surface.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
@@ -22,8 +26,23 @@
 
 namespace views {
 
-typedef ViewsTestBase DesktopCaptureControllerTest;
+class DesktopCaptureControllerTest : public ViewsTestBase {
+ public:
+  DesktopCaptureControllerTest() {}
+  virtual ~DesktopCaptureControllerTest() {}
 
+  virtual void SetUp() OVERRIDE {
+    gfx::GLSurface::InitializeOneOffForTests();

[sky, 2014/03/14 21:35:56]

Should this be moved to ViewsTestBase?

[jam, 2014/03/14 22:35:40]

can't as then it would be run twice in unit tests

+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+
+    ViewsTestBase::SetUp();
+  }
+};
+
 // This class provides functionality to verify whether the View instance
 // received the gesture event.
 class DesktopViewInputTest : public View {