Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / test / pixel_test.h

diff --git a/src/cc/test/pixel_test.h b/src/cc/test/pixel_test.h
index dc01098..94c6fa9 100644 (file)
--- a/src/cc/test/pixel_test.h
+++ b/src/cc/test/pixel_test.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
 #include "cc/quads/render_pass.h"
@@ -28,20 +28,13 @@ class PixelTest : public testing::Test, RendererClient {
   PixelTest();
   virtual ~PixelTest();
 
-  enum OffscreenContextOption {
-    NoOffscreenContext,
-    WithOffscreenContext
-  };
-
   bool RunPixelTest(RenderPassList* pass_list,
-                    OffscreenContextOption provide_offscreen_context,
                     const base::FilePath& ref_file,
                     const PixelComparator& comparator);
 
   bool RunPixelTestWithReadbackTarget(
       RenderPassList* pass_list,
       RenderPass* target,
-      OffscreenContextOption provide_offscreen_context,
       const base::FilePath& ref_file,
       const PixelComparator& comparator);
 
@@ -52,6 +45,7 @@ class PixelTest : public testing::Test, RendererClient {
   scoped_ptr<FakeOutputSurfaceClient> output_surface_client_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
+  scoped_ptr<BlockingTaskRunner> main_thread_task_runner_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;
   scoped_ptr<DirectRenderer> renderer_;