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

content/browser/appcache/appcache_storage_impl_unittest.cc

 // 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 "content/browser/appcache/appcache_storage_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <stack>
@@ skipping 149 matching lines @@
 
   ~IOThread() override { Stop(); }
 
   net::URLRequestContext* request_context() {
     return request_context_.get();
   }
 
   void Init() override {
     std::unique_ptr<net::URLRequestJobFactoryImpl> factory(
         new net::URLRequestJobFactoryImpl());
-    factory->SetProtocolHandler(
-        "http", base::WrapUnique(new MockHttpServerJobFactory(
-                    base::WrapUnique(new AppCacheInterceptor()))));
+    factory->SetProtocolHandler("http",
+                                base::MakeUnique<MockHttpServerJobFactory>(
+                                    base::MakeUnique<AppCacheInterceptor>()));
     job_factory_ = std::move(factory);
     request_context_.reset(new net::TestURLRequestContext());
     request_context_->set_job_factory(job_factory_.get());
   }
 
   void CleanUp() override {
     request_context_.reset();
     job_factory_.reset();
   }
 
@@ skipping 1846 matching lines @@
   RunTestOnIOThread(&AppCacheStorageImplTest::Reinitialize2);
 }
 
 TEST_F(AppCacheStorageImplTest, Reinitialize3) {
   RunTestOnIOThread(&AppCacheStorageImplTest::Reinitialize3);
 }
 
 // That's all folks!
 
 }  // namespace content