Revert of Disable some GLAndSoftwareCompositing content browser tests under MSAN.

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/barrier_closure.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 311 matching lines @@
       gfx::Rect(view->GetViewBounds().size()), dest, base::Bind(
           &RenderWidgetHostViewBrowserTest::FinishCopyFromCompositingSurface,
           base::Unretained(this), run_loop.QuitClosure()));
   run_loop.Run();
 
   EXPECT_EQ(1, callback_invoke_count());
 }
 
 // Test basic frame subscription functionality.  We subscribe, and then run
 // until at least one DeliverFrameCallback has been invoked.
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_FrameSubscriberTest DISABLED_FrameSubscriberTest
-#else
-#define MAYBE_FrameSubscriberTest FrameSubscriberTest
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest,
-                       MAYBE_FrameSubscriberTest) {
+                       FrameSubscriberTest) {
   SET_UP_SURFACE_OR_PASS_TEST(NULL);
   RenderWidgetHostViewBase* const view = GetRenderWidgetHostView();
 
   base::RunLoop run_loop;
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber(
       new FakeFrameSubscriber(base::Bind(
           &RenderWidgetHostViewBrowserTest::FrameDelivered,
           base::Unretained(this), base::ThreadTaskRunnerHandle::Get(),
           run_loop.QuitClosure())));
   view->BeginFrameSubscription(subscriber.Pass());
@@ skipping 347 matching lines @@
  private:
   // |readback_response_| is always a content::ReadbackResponse or
   // ExtraReadbackResponsesForTest enum value.
   int readback_response_;
   SkBitmap expected_copy_from_compositing_surface_bitmap_;
   int allowable_error_;
   gfx::Rect exclude_rect_;
   std::string test_url_;
 };
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_Origin_Unscaled \
-  DISABLED_CopyFromCompositingSurface_Origin_Unscaled
-#else
-#define MAYBE_CopyFromCompositingSurface_Origin_Unscaled \
-  CopyFromCompositingSurface_Origin_Unscaled
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_Origin_Unscaled) {
+                       CopyFromCompositingSurface_Origin_Unscaled) {
   gfx::Rect copy_rect(400, 300);
   gfx::Size output_size = copy_rect.size();
   gfx::Size html_rect_size(400, 300);
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_Origin_Scaled \
-  DISABLED_FrameSubscriberTestCopyFromCompositingSurface_Origin_Scaled
-#else
-#define MAYBE_CopyFromCompositingSurface_Origin_Scaled \
-  CopyFromCompositingSurface_Origin_Scaled
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_Origin_Scaled) {
+                       CopyFromCompositingSurface_Origin_Scaled) {
   gfx::Rect copy_rect(400, 300);
   gfx::Size output_size(200, 100);
   gfx::Size html_rect_size(400, 300);
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_Cropped_Unscaled \
-  DISABLED_CopyFromCompositingSurface_Cropped_Unscaled
-#else
-#define MAYBE_CopyFromCompositingSurface_Cropped_Unscaled \
-  CopyFromCompositingSurface_Cropped_Unscaled
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_Cropped_Unscaled) {
+                       CopyFromCompositingSurface_Cropped_Unscaled) {
   // Grab 60x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect(400, 300);
   copy_rect = gfx::Rect(copy_rect.CenterPoint() - gfx::Vector2d(30, 30),
                         gfx::Size(60, 60));
   gfx::Size output_size = copy_rect.size();
   gfx::Size html_rect_size(400, 300);
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_Cropped_Scaled \
-  DISABLED_CopyFromCompositingSurface_Cropped_Scaled
-#else
-#define MAYBE_CopyFromCompositingSurface_Cropped_Scaled \
-  CopyFromCompositingSurface_Cropped_Scaled
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_Cropped_Scaled) {
+                       CopyFromCompositingSurface_Cropped_Scaled) {
   // Grab 60x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect(400, 300);
   copy_rect = gfx::Rect(copy_rect.CenterPoint() - gfx::Vector2d(30, 30),
                         gfx::Size(60, 60));
   gfx::Size output_size(20, 10);
   gfx::Size html_rect_size(400, 300);
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_ForVideoFrame \
-  DISABLED_CopyFromCompositingSurface_ForVideoFrame
-#else
-#define MAYBE_CopyFromCompositingSurface_ForVideoFrame \
-  CopyFromCompositingSurface_ForVideoFrame
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_ForVideoFrame) {
+                       CopyFromCompositingSurface_ForVideoFrame) {
   // Grab 90x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect(400, 300);
   copy_rect = gfx::Rect(copy_rect.CenterPoint() - gfx::Vector2d(45, 30),
                         gfx::Size(90, 60));
   gfx::Size output_size = copy_rect.size();
   gfx::Size html_rect_size(400, 300);
   bool video_frame = true;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
-// https://crbug.com/542896
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CopyFromCompositingSurface_ForVideoFrame_Scaled \
-  DISABLED_CopyFromCompositingSurface_ForVideoFrame_Scaled
-#else
-#define MAYBE_CopyFromCompositingSurface_ForVideoFrame_Scaled \
-  CopyFromCompositingSurface_ForVideoFrame_Scaled
-#endif
 IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTestTabCapture,
-                       MAYBE_CopyFromCompositingSurface_ForVideoFrame_Scaled) {
+                       CopyFromCompositingSurface_ForVideoFrame_Scaled) {
   // Grab 90x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect(400, 300);
   copy_rect = gfx::Rect(copy_rect.CenterPoint() - gfx::Vector2d(45, 30),
                         gfx::Size(90, 60));
   // Scale to 30 x 20 (preserve aspect ratio).
   gfx::Size output_size(30, 20);
   gfx::Size html_rect_size(400, 300);
   bool video_frame = true;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
@@ skipping 30 matching lines @@
 
   static float scale() { return 2.0f; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(
       CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI);
 };
 
 // NineImagePainter implementation crashes the process on Windows when this
 // content_browsertest forces a device scale factor.  http://crbug.com/399349
-// Disabled under MSAN.  http://crbug.com/542896
-#if defined(OS_WIN) || defined(MEMORY_SANITIZER)
+#if defined(OS_WIN)
 #define MAYBE_CopyToBitmap_EntireRegion DISABLED_CopyToBitmap_EntireRegion
 #define MAYBE_CopyToBitmap_CenterRegion DISABLED_CopyToBitmap_CenterRegion
 #define MAYBE_CopyToBitmap_ScaledResult DISABLED_CopyToBitmap_ScaledResult
 #define MAYBE_CopyToVideoFrame_EntireRegion \
             DISABLED_CopyToVideoFrame_EntireRegion
 #define MAYBE_CopyToVideoFrame_CenterRegion \
             DISABLED_CopyToVideoFrame_CenterRegion
 #define MAYBE_CopyToVideoFrame_ScaledResult \
             DISABLED_CopyToVideoFrame_ScaledResult
 #else
@@ skipping 111 matching lines @@
                         kTestCompositingModes);
 INSTANTIATE_TEST_CASE_P(
     GLAndSoftwareCompositing,
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     kTestCompositingModes);
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 }  // namespace
 }  // namespace content