Upstream version 7.36.149.0

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

diff --git a/src/content/browser/renderer_host/render_widget_host_browsertest.cc b/src/content/browser/renderer_host/render_widget_host_browsertest.cc
index bfdf6a5..4837781 100644 (file)
--- a/src/content/browser/renderer_host/render_widget_host_browsertest.cc
+++ b/src/content/browser/renderer_host/render_widget_host_browsertest.cc
@@ -7,10 +7,10 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
+#include "content/public/test/content_browser_test.h"
+#include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "content/test/content_browser_test.h"
-#include "content/test/content_browser_test_utils.h"
-#include "net/base/net_util.h"
+#include "net/base/filename_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
@@ -19,56 +19,12 @@ class RenderWidgetHostBrowserTest : public ContentBrowserTest {
  public:
   RenderWidgetHostBrowserTest() {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpOnMainThread() OVERRIDE {
     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 Windows and CrOS because it is flaky: crbug.com/272379.
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
-#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