TestingPlatformSupport: register Platform instance correctly

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

 // Copyright 2014 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 "platform/graphics/RecordingImageBufferSurface.h"
 
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/ImageBufferClient.h"
@@ skipping 213 matching lines @@
               m_surfaceFactory->createSurfaceCount());
   }
 
  private:
   MockSurfaceFactory* m_surfaceFactory;
   RecordingImageBufferSurface* m_testSurface;
   std::unique_ptr<FakeImageBufferClient> m_fakeImageBufferClient;
   std::unique_ptr<ImageBuffer> m_imageBuffer;
 };
 
-#define CALL_TEST_TASK_WRAPPER(TEST_METHOD)                             \
-  {                                                                     \
-    TestingPlatformSupportWithMockScheduler testingPlatform;            \
-    Platform::current()->currentThread()->getWebTaskRunner()->postTask( \
-        BLINK_FROM_HERE,                                                \
-        WTF::bind(&RecordingImageBufferSurfaceTest::TEST_METHOD,        \
-                  WTF::unretained(this)));                              \
-    testingPlatform.runUntilIdle();                                     \
+#define CALL_TEST_TASK_WRAPPER(TEST_METHOD)                               \
+  {                                                                       \
+    ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler> \
+        platform;                                                         \
+    Platform::current()->currentThread()->getWebTaskRunner()->postTask(   \
+        BLINK_FROM_HERE,                                                  \
+        WTF::bind(&RecordingImageBufferSurfaceTest::TEST_METHOD,          \
+                  WTF::unretained(this)));                                \
+    platform->runUntilIdle();                                             \
   }
 
 TEST_F(RecordingImageBufferSurfaceTest, testEmptyPicture) {
   testEmptyPicture();
 }
 
 TEST_F(RecordingImageBufferSurfaceTest, testNoFallbackWithClear) {
   testNoFallbackWithClear();
 }
 
@@ skipping 18 matching lines @@
   CALL_TEST_TASK_WRAPPER(testAnimatedWithClear)
   expectDisplayListEnabled(true);
 }
 
 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) {
   CALL_TEST_TASK_WRAPPER(testClearRect);
   expectDisplayListEnabled(true);
 }
 
 }  // namespace blink