Re-write many calls to WrapUnique() with MakeUnique()

chrome/test/base/chrome_render_view_test.cc

 // Copyright (c) 2012 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 "chrome/test/base/chrome_render_view_test.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 149 matching lines @@
 
 void ChromeRenderViewTest::RegisterMainFrameRemoteInterfaces() {}
 
 void ChromeRenderViewTest::InitChromeContentRendererClient(
     ChromeContentRendererClient* client) {
 #if defined(ENABLE_EXTENSIONS)
   extension_dispatcher_delegate_.reset(
       new ChromeExtensionsDispatcherDelegate());
   ChromeExtensionsRendererClient* ext_client =
       ChromeExtensionsRendererClient::GetInstance();
-  ext_client->SetExtensionDispatcherForTest(base::WrapUnique(
-      new extensions::Dispatcher(extension_dispatcher_delegate_.get())));
+  ext_client->SetExtensionDispatcherForTest(
+      base::MakeUnique<extensions::Dispatcher>(
+          extension_dispatcher_delegate_.get()));
 #endif
 #if defined(ENABLE_SPELLCHECK)
   client->SetSpellcheck(new SpellCheck());
 #endif
 }
 
 void ChromeRenderViewTest::EnableUserGestureSimulationForAutofill() {
   EXPECT_CALL(*(static_cast<MockAutofillAgent*>(autofill_agent_)),
               IsUserGesture()).WillRepeatedly(Return(true));
 }
 
 void ChromeRenderViewTest::DisableUserGestureSimulationForAutofill() {
   EXPECT_CALL(*(static_cast<MockAutofillAgent*>(autofill_agent_)),
               IsUserGesture()).WillRepeatedly(Return(false));
 }
 
 void ChromeRenderViewTest::WaitForAutofillDidAssociateFormControl() {
   static_cast<MockAutofillAgent*>(autofill_agent_)
       ->WaitForAutofillDidAssociateFormControl();
 }