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

chrome/browser/net/errorpage_browsertest.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 <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 1300 matching lines @@
     // Sets up a mock policy provider for user and device policies.
     EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
         .WillRepeatedly(testing::Return(true));
 
     policy::PolicyMap policy_map;
 #if defined(OS_CHROMEOS)
     if (enroll_)
       SetEnterpriseUsersDefaults(&policy_map);
 #endif
     if (set_allow_dinosaur_easter_egg_) {
-      policy_map.Set(
-          policy::key::kAllowDinosaurEasterEgg, policy::POLICY_LEVEL_MANDATORY,
-          policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-          base::WrapUnique(
-              new base::FundamentalValue(value_of_allow_dinosaur_easter_egg_)),
-          nullptr);
+      policy_map.Set(policy::key::kAllowDinosaurEasterEgg,
+                     policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
+                     policy::POLICY_SOURCE_CLOUD,
+                     base::MakeUnique<base::FundamentalValue>(
+                         value_of_allow_dinosaur_easter_egg_),
+                     nullptr);
     }
     policy_provider_.UpdateChromePolicy(policy_map);
 
 #if defined(OS_CHROMEOS)
     policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
         &policy_provider_);
 #else
     policy::ProfilePolicyConnectorFactory::GetInstance()
         ->PushProviderForTesting(&policy_provider_);
 #endif
@@ skipping 196 matching lines @@
                        Http09WeirdPortEnabled) {
   const char kHttp09Response[] = "JumboShrimp";
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(std::string("/echo-raw?") +
                                                 kHttp09Response));
   EXPECT_TRUE(IsDisplayingText(browser(), kHttp09Response));
 }
 
 }  // namespace