Index: content/browser/renderer_host/render_widget_host_browsertest.cc |
diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc |
index 7ceb70a5f491950b63980d5310a17ce0292ba9ac..483778167b2c9feb8a6e0b9de85fc00d3d57bea0 100644 |
--- a/content/browser/renderer_host/render_widget_host_browsertest.cc |
+++ b/content/browser/renderer_host/render_widget_host_browsertest.cc |
@@ -23,52 +23,8 @@ class RenderWidgetHostBrowserTest : public ContentBrowserTest { |
ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_)); |
} |
- void GetSnapshotFromRendererCallback(const base::Closure& quit_closure, |
- bool* snapshot_valid, |
- bool success, |
- const SkBitmap& bitmap) { |
- quit_closure.Run(); |
- EXPECT_EQ(success, true); |
- |
- const int row_bytes = bitmap.rowBytesAsPixels(); |
- SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels()); |
- for (int i = 0; i < bitmap.width(); ++i) { |
- for (int j = 0; j < bitmap.height(); ++j) { |
- if (pixels[j * row_bytes + i] != SK_ColorRED) { |
- return; |
- } |
- } |
- } |
- *snapshot_valid = true; |
- } |
- |
protected: |
base::FilePath test_dir_; |
}; |
-// Disabled on Aura since this is not possible with ubercomp. |
-#if defined(USE_AURA) |
-#define MAYBE_GetSnapshotFromRendererTest DISABLED_GetSnapshotFromRendererTest |
-#else |
-#define MAYBE_GetSnapshotFromRendererTest GetSnapshotFromRendererTest |
-#endif |
-IN_PROC_BROWSER_TEST_F(RenderWidgetHostBrowserTest, |
- MAYBE_GetSnapshotFromRendererTest) { |
- base::RunLoop run_loop; |
- |
- NavigateToURL(shell(), GURL(net::FilePathToFileURL( |
- test_dir_.AppendASCII("rwh_simple.html")))); |
- |
- bool snapshot_valid = false; |
- RenderViewHost* const rwh = shell()->web_contents()->GetRenderViewHost(); |
- rwh->GetSnapshotFromRenderer(gfx::Rect(), base::Bind( |
- &RenderWidgetHostBrowserTest::GetSnapshotFromRendererCallback, |
- base::Unretained(this), |
- run_loop.QuitClosure(), |
- &snapshot_valid)); |
- run_loop.Run(); |
- |
- EXPECT_EQ(snapshot_valid, true); |
-} |
- |
} // namespace content |