Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / render_widget_host_view_browsertest.cc

diff --git a/src/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/src/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 2548294..9642baa 100644 (file)
--- a/src/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/src/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -493,7 +493,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
                           video_frame->visible_rect().height());
     // Don't clear the canvas because drawing a video frame by Src mode.
     SkCanvas canvas(bitmap);
-    video_renderer.Copy(video_frame.get(), &canvas);
+    video_renderer.Copy(video_frame, &canvas);
 
     CopyFromCompositingSurfaceCallback(quit_callback,
                                        result,
@@ -789,7 +789,9 @@ class CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI
 // ImageSkia (related to ResourceBundle) implementation crashes the process on
 // Windows when this content_browsertest forces a device scale factor.
 // http://crbug.com/399349
-#if defined(OS_WIN)
+//
+// These tests are flaky on ChromeOS builders.  See http://crbug.com/406018.
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
 #define MAYBE_CopyToBitmap_EntireRegion DISABLED_CopyToBitmap_EntireRegion
 #define MAYBE_CopyToBitmap_CenterRegion DISABLED_CopyToBitmap_CenterRegion
 #define MAYBE_CopyToBitmap_ScaledResult DISABLED_CopyToBitmap_ScaledResult