Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / cc / layers / tiled_layer_unittest.cc

diff --git a/src/cc/layers/tiled_layer_unittest.cc b/src/cc/layers/tiled_layer_unittest.cc
index a0c469f..bc83743 100644 (file)
--- a/src/cc/layers/tiled_layer_unittest.cc
+++ b/src/cc/layers/tiled_layer_unittest.cc
@@ -68,13 +68,11 @@ class SynchronousOutputSurfaceLayerTreeHost : public LayerTreeHost {
     return output_surface_created_;
   }
 
-  virtual CreateResult OnCreateAndInitializeOutputSurfaceAttempted(
+  virtual void OnCreateAndInitializeOutputSurfaceAttempted(
       bool success) OVERRIDE {
-    CreateResult result =
-        LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted(success);
+    LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted(success);
     output_surface_created_ = success;
     run_loop_.Quit();
-    return result;
   }
 
  private:
@@ -124,7 +122,8 @@ class TiledLayerTest : public testing::Test {
     DebugScopedSetImplThreadAndMainThreadBlocked
         impl_thread_and_main_thread_blocked(proxy_);
     resource_provider_ = ResourceProvider::Create(
-        output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
+        output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1,
+        false);
     host_impl_ = make_scoped_ptr(
         new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get()));
   }