Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / browser / compositor / software_browser_compositor_output_surface_unittest.cc

diff --git a/src/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/src/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
index 9bc2a01..3f48d21 100644 (file)
--- a/src/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
+++ b/src/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
@@ -7,9 +7,9 @@
 #include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
 #include "content/browser/compositor/software_browser_compositor_output_surface.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/vsync_provider.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace {
 
@@ -80,7 +80,8 @@ class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
 
 SoftwareBrowserCompositorOutputSurfaceTest::
     SoftwareBrowserCompositorOutputSurfaceTest() {
-  CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));
+  // |message_loop_| is not used, but the main thread still has to exist for the
+  // compositor to use.
   message_loop_.reset(new base::MessageLoopForUI);
 }
 
@@ -116,8 +117,7 @@ SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface(
           device.Pass(),
           1,
           &surface_map_,
-          compositor_->GetCompositorMessageLoop(),
-          compositor_->AsWeakPtr()));
+          compositor_->vsync_manager()));
 }
 
 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {