Fix UiThreadGpu initialization for video accelerator tests

ui/ozone/demo/ozone_demo.cc

 // Copyright 2014 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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/ozone/demo/gl_renderer.h"
 #include "ui/ozone/demo/software_renderer.h"
 #include "ui/ozone/demo/surfaceless_gl_renderer.h"
 #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
+#include "ui/ozone/public/ozone_gpu_test_helper.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/ozone_switches.h"
-#include "ui/ozone/public/ui_thread_gpu.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 const int kTestWindowWidth = 800;
 const int kTestWindowHeight = 600;
 
 const int kFrameDelayMilliseconds = 16;
 
 const char kDisableGpu[] = "disable-gpu";
 
@@ skipping 13 matching lines @@
   ~RendererFactory();
 
   bool Initialize();
   scoped_ptr<ui::Renderer> CreateRenderer(gfx::AcceleratedWidget widget,
                                           const gfx::Size& size);
 
  private:
   RendererType type_;
 
   // Helper for applications that do GL on main thread.
-  ui::UiThreadGpu ui_thread_gpu_;
+  ui::OzoneGpuTestHelper gpu_helper_;
 
   // Used by the surfaceless renderers to allocate buffers.
   ui::GpuMemoryBufferFactoryOzoneNativeBuffer buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererFactory);
 };
 
 class WindowManager : public ui::NativeDisplayObserver {
  public:
   WindowManager(const base::Closure& quit_closure);
@@ skipping 119 matching lines @@
 
 RendererFactory::RendererFactory() : type_(SOFTWARE) {
 }
 
 RendererFactory::~RendererFactory() {
 }
 
 bool RendererFactory::Initialize() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(kDisableGpu) &&
-      gfx::GLSurface::InitializeOneOff() && ui_thread_gpu_.Initialize()) {
+      gfx::GLSurface::InitializeOneOff() &&
+      gpu_helper_.Initialize(base::ThreadTaskRunnerHandle::Get(),
+                             base::ThreadTaskRunnerHandle::Get())) {
     if (command_line->HasSwitch(switches::kOzoneUseSurfaceless)) {
       type_ = SURFACELESS_GL;
     } else {
       type_ = GL;
     }
   } else {
     type_ = SOFTWARE;
   }
 
   return true;
@@ skipping 124 matching lines @@
       ->SetCurrentLayoutByName("us");
 
   base::RunLoop run_loop;
 
   WindowManager window_manager(run_loop.QuitClosure());
 
   run_loop.Run();
 
   return 0;
 }