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

chrome/common/extensions/api/extension_action/page_action_manifest_unittest.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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
@@ skipping 20 matching lines @@
   std::unique_ptr<ActionInfo> LoadAction(const std::string& manifest_filename);
 };
 
 std::unique_ptr<ActionInfo> PageActionManifestTest::LoadAction(
     const std::string& manifest_filename) {
   scoped_refptr<Extension> extension = LoadAndExpectSuccess(
       manifest_filename.c_str());
   const ActionInfo* page_action_info =
       ActionInfo::GetPageActionInfo(extension.get());
   EXPECT_TRUE(page_action_info);
   if (page_action_info) {

[sky, 2016/09/14 17:46:42]

optional: while here remove {}

[Adam Rice, 2016/09/15 02:05:55]

Done.

-    return base::WrapUnique(new ActionInfo(*page_action_info));
+    return base::MakeUnique<ActionInfo>(*page_action_info);
   }
   ADD_FAILURE() << "Expected manifest in " << manifest_filename
                 << " to include a page_action section.";
   return std::unique_ptr<ActionInfo>();

[sky, 2016/09/14 17:46:43]

return nullptr?

[Adam Rice, 2016/09/15 02:05:55]

Done.

 }
 
 TEST_F(PageActionManifestTest, ManifestVersion2) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("page_action_manifest_version_2.json"));
   ASSERT_TRUE(extension.get());
   const ActionInfo* page_action_info =
       ActionInfo::GetPageActionInfo(extension.get());
   ASSERT_TRUE(page_action_info);
 
@@ skipping 108 matching lines @@
   action = LoadAction("page_action_empty_popup.json");
 
   ASSERT_TRUE(action);
   EXPECT_TRUE(action->default_popup_url.is_empty());
   ASSERT_STREQ(
       "",
       action->default_popup_url.spec().c_str());
 }
 
 }  // namespace extensions