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

services/shell/background/tests/background_shell_unittest.cc

 // Copyright 2016 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 "services/shell/background/background_shell.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 14 matching lines @@
   ServiceImpl() {}
   ~ServiceImpl() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceImpl);
 };
 
 std::unique_ptr<TestCatalogStore> BuildTestCatalogStore() {
   std::unique_ptr<base::ListValue> apps(new base::ListValue);
   apps->Append(BuildPermissiveSerializedAppInfo(kTestName, "test"));
-  return base::WrapUnique(new TestCatalogStore(std::move(apps)));
+  return base::MakeUnique<TestCatalogStore>(std::move(apps));
 }
 
 void SetFlagAndRunClosure(bool* flag, const base::Closure& closure) {
   *flag = true;
   closure.Run();
 }
 
 }  // namespace
 
 // Uses BackgroundShell to start the shell in the background and connects to
@@ skipping 24 matching lines @@
   base::RunLoop run_loop;
   bool got_result = false;
   test_service->Test(base::Bind(&SetFlagAndRunClosure, &got_result,
                                 run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(got_result);
   EXPECT_TRUE(store->get_store_called());
 }
 
 }  // namespace shell