Replace wrapUnique(new T(args)) by makeUnique<T>(args) in Blink

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 329 matching lines @@
                void(Canvas2DLayerBridge::HibernationEvent));
   MOCK_METHOD0(didStartHibernating, void());
   virtual ~MockLogger() {}
 };
 
 void runCreateBridgeTask(Canvas2DLayerBridgePtr* bridgePtr,
                          gpu::gles2::GLES2Interface* gl,
                          Canvas2DLayerBridgeTest* testHost,
                          WaitableEvent* doneEvent) {
   std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider =
-      wrapUnique(new FakeWebGraphicsContext3DProvider(gl));
+      makeUnique<FakeWebGraphicsContext3DProvider>(gl);
   *bridgePtr =
       testHost->makeBridge(std::move(contextProvider), IntSize(300, 300),
                            Canvas2DLayerBridge::EnableAcceleration);
   // draw+flush to trigger the creation of a GPU surface
   (*bridgePtr)->didDraw(FloatRect(0, 0, 1, 1));
   (*bridgePtr)->finalizeFrame(FloatRect(0, 0, 1, 1));
   (*bridgePtr)->flush();
   doneEvent->signal();
 }
 
 void postAndWaitCreateBridgeTask(const WebTraceLocation& location,
                                  WebThread* testThread,
                                  Canvas2DLayerBridgePtr* bridgePtr,
                                  gpu::gles2::GLES2Interface* gl,
                                  Canvas2DLayerBridgeTest* testHost) {
   std::unique_ptr<WaitableEvent> bridgeCreatedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   testThread->getWebTaskRunner()->postTask(
       location, crossThreadBind(
                     &runCreateBridgeTask, crossThreadUnretained(bridgePtr),
                     crossThreadUnretained(gl), crossThreadUnretained(testHost),
                     crossThreadUnretained(bridgeCreatedEvent.get())));
   bridgeCreatedEvent->wait();
 }
 
 void runDestroyBridgeTask(Canvas2DLayerBridgePtr* bridgePtr,
                           WaitableEvent* doneEvent) {
   bridgePtr->clear();
   if (doneEvent)
     doneEvent->signal();
 }
 
 void postDestroyBridgeTask(const WebTraceLocation& location,
                            WebThread* testThread,
                            Canvas2DLayerBridgePtr* bridgePtr) {
   testThread->getWebTaskRunner()->postTask(
       location, crossThreadBind(&runDestroyBridgeTask,
                                 crossThreadUnretained(bridgePtr), nullptr));
 }
 
 void postAndWaitDestroyBridgeTask(const WebTraceLocation& location,
                                   WebThread* testThread,
                                   Canvas2DLayerBridgePtr* bridgePtr) {
   std::unique_ptr<WaitableEvent> bridgeDestroyedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   testThread->getWebTaskRunner()->postTask(
       location,
       crossThreadBind(&runDestroyBridgeTask, crossThreadUnretained(bridgePtr),
                       crossThreadUnretained(bridgeDestroyedEvent.get())));
   bridgeDestroyedEvent->wait();
 }
 
 void runSetIsHiddenTask(Canvas2DLayerBridge* bridge,
                         bool value,
                         WaitableEvent* doneEvent) {
@@ skipping 10 matching lines @@
   testThread->getWebTaskRunner()->postTask(
       location,
       crossThreadBind(&runSetIsHiddenTask, crossThreadUnretained(bridge), value,
                       crossThreadUnretained(doneEvent)));
 }
 
 void postAndWaitSetIsHiddenTask(const WebTraceLocation& location,
                                 WebThread* testThread,
                                 Canvas2DLayerBridge* bridge,
                                 bool value) {
-  std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());
+  std::unique_ptr<WaitableEvent> doneEvent = makeUnique<WaitableEvent>();
   postSetIsHiddenTask(location, testThread, bridge, value, doneEvent.get());
   doneEvent->wait();
 }
 
 class MockImageBuffer : public ImageBuffer {
  public:
   MockImageBuffer()
       : ImageBuffer(
             wrapUnique(new UnacceleratedImageBufferSurface(IntSize(1, 1)))) {}
 
@@ skipping 18 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   EXPECT_FALSE(bridge->isAccelerated());
   EXPECT_TRUE(bridge->isHibernating());
@@ skipping 31 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   // Toggle visibility before the task that enters hibernation gets a
   // chance to run.
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), false);
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
@@ skipping 42 matching lines @@
   EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AnyNumber());
   bridge->setImageBuffer(&mockImageBuffer);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
   EXPECT_FALSE(bridge->isAccelerated());
@@ skipping 22 matching lines @@
 void runRenderingTask(Canvas2DLayerBridge* bridge, WaitableEvent* doneEvent) {
   bridge->didDraw(FloatRect(0, 0, 1, 1));
   bridge->finalizeFrame(FloatRect(0, 0, 1, 1));
   bridge->flush();
   doneEvent->signal();
 }
 
 void postAndWaitRenderingTask(const WebTraceLocation& location,
                               WebThread* testThread,
                               Canvas2DLayerBridge* bridge) {
-  std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());
+  std::unique_ptr<WaitableEvent> doneEvent = makeUnique<WaitableEvent>();
   testThread->getWebTaskRunner()->postTask(
       location,
       crossThreadBind(&runRenderingTask, crossThreadUnretained(bridge),
                       crossThreadUnretained(doneEvent.get())));
   doneEvent->wait();
 }
 
 #if CANVAS2D_HIBERNATION_ENABLED && CANVAS2D_BACKGROUND_RENDER_SWITCH_TO_CPU
 TEST_F(Canvas2DLayerBridgeTest, BackgroundRenderingWhileHibernating)
 #else
@@ skipping 10 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   EXPECT_FALSE(bridge->isAccelerated());
   EXPECT_TRUE(bridge->isHibernating());
@@ skipping 47 matching lines @@
   bridge->setImageBuffer(&mockImageBuffer);
   bridge->disableDeferral(DisableDeferralReasonUnknown);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
   EXPECT_FALSE(bridge->isAccelerated());
@@ skipping 50 matching lines @@
   EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AnyNumber());
   bridge->setImageBuffer(&mockImageBuffer);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
   EXPECT_FALSE(bridge->isAccelerated());
@@ skipping 46 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   EXPECT_FALSE(bridge->isAccelerated());
   EXPECT_TRUE(bridge->isHibernating());
@@ skipping 22 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
   EXPECT_FALSE(bridge->isAccelerated());
   EXPECT_TRUE(bridge->isHibernating());
   EXPECT_TRUE(bridge->checkSurfaceValid());
 
   // Take a snapshot and verify that it is not accelerated due to hibernation
   sk_sp<SkImage> image =
       bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnitTests);
   EXPECT_FALSE(image->isTextureBacked());
   image.reset();
 
   // Verify that taking a snapshot did not affect the state of bridge
   EXPECT_FALSE(bridge->isAccelerated());
   EXPECT_TRUE(bridge->isHibernating());
   EXPECT_TRUE(bridge->checkSurfaceValid());
 
   // End hibernation normally
   std::unique_ptr<WaitableEvent> hibernationEndedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(
       *mockLoggerPtr,
       reportHibernationEvent(Canvas2DLayerBridge::HibernationEndedNormally))
       .WillOnce(testing::InvokeWithoutArgs(hibernationEndedEvent.get(),
                                            &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), false);
   hibernationEndedEvent->wait();
 
   // Tear down the bridge while hibernating
   postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
@@ skipping 15 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationScheduledEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true,
                       hibernationScheduledEvent.get());
   postDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
   // In production, we would expect a
   // HibernationAbortedDueToDestructionWhileHibernatePending event to be
   // fired, but that signal is lost in the unit test due to no longer having
   // a bridge to hold the mockLogger.
   hibernationScheduledEvent->wait();
   // Once we know the hibernation task is scheduled, we can schedule a fence.
   // Assuming tasks are guaranteed to run in the order they were
   // submitted, this fence will guarantee the attempt to hibernate runs to
   // completion before the thread is destroyed.
   // This test passes by not crashing, which proves that the WeakPtr logic
   // is sound.
-  std::unique_ptr<WaitableEvent> fenceEvent = wrapUnique(new WaitableEvent());
+  std::unique_ptr<WaitableEvent> fenceEvent = makeUnique<WaitableEvent>();
   testThread->getWebTaskRunner()->postTask(
       BLINK_FROM_HERE,
       WTF::bind(&WaitableEvent::signal, unretained(fenceEvent.get())));
   fenceEvent->wait();
 }
 
 #if CANVAS2D_HIBERNATION_ENABLED
 TEST_F(Canvas2DLayerBridgeTest, HibernationAbortedDueToPendingTeardown)
 #else
 TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToPendingTeardown)
 #endif
 {
   FakeGLES2Interface gl;
   std::unique_ptr<WebThread> testThread =
       wrapUnique(Platform::current()->createThread("TestThread"));
 
   // The Canvas2DLayerBridge has to be created on the thread that will use it
   // to avoid WeakPtr thread check issues.
   Canvas2DLayerBridgePtr bridge;
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(
       *mockLoggerPtr,
       reportHibernationEvent(
           Canvas2DLayerBridge::HibernationAbortedDueToPendingDestruction))
       .WillOnce(testing::InvokeWithoutArgs(hibernationAbortedEvent.get(),
                                            &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   testThread->getWebTaskRunner()->postTask(
@@ skipping 24 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr,
               reportHibernationEvent(
                   Canvas2DLayerBridge::HibernationAbortedDueToVisibilityChange))
       .WillOnce(testing::InvokeWithoutArgs(hibernationAbortedEvent.get(),
                                            &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), false);
   hibernationAbortedEvent->wait();
@@ skipping 24 matching lines @@
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   gl.setIsContextLost(true);
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr,
               reportHibernationEvent(
                   Canvas2DLayerBridge::HibernationAbortedDueGpuContextLoss))
       .WillOnce(testing::InvokeWithoutArgs(hibernationAbortedEvent.get(),
                                            &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationAbortedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
@@ skipping 20 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
 
   // Test prepareMailbox while hibernating
@@ skipping 27 matching lines @@
   postAndWaitCreateBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge, &gl,
                               this);
 
   // Register an alternate Logger for tracking hibernation events
   std::unique_ptr<MockLogger> mockLogger = wrapUnique(new MockLogger);
   MockLogger* mockLoggerPtr = mockLogger.get();
   bridge->setLoggerForTesting(std::move(mockLogger));
 
   // Test entering hibernation
   std::unique_ptr<WaitableEvent> hibernationStartedEvent =
-      wrapUnique(new WaitableEvent());
+      makeUnique<WaitableEvent>();
   EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
                                   Canvas2DLayerBridge::HibernationScheduled));
   EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
       .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
                                 &WaitableEvent::signal));
   postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
   hibernationStartedEvent->wait();
   ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
 
   // Rendering in the background -> temp switch to SW
@@ skipping 13 matching lines @@
   EXPECT_FALSE(
       bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback));
   EXPECT_TRUE(bridge->checkSurfaceValid());
 
   // Tear down the bridge on the thread so that 'bridge' can go out of scope
   // without crashing due to thread checks
   postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
 }
 
 }  // namespace blink