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

remoting/host/token_validator_factory_impl_unittest.cc

 // Copyright 2013 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.
 //
 // A set of unit tests for TokenValidatorFactoryImpl
 
 #include "remoting/host/token_validator_factory_impl.h"
 
 #include <memory>
 #include <string>
@@ skipping 42 matching lines @@
 
  private:
   std::string headers_;
   std::string response_;
 };
 
 class SetResponseURLRequestContext: public net::TestURLRequestContext {
  public:
   void SetResponse(const std::string& headers, const std::string& response) {
     std::unique_ptr<net::URLRequestJobFactoryImpl> factory =
-        base::WrapUnique(new net::URLRequestJobFactoryImpl());
+        base::MakeUnique<net::URLRequestJobFactoryImpl>();
     factory->SetProtocolHandler(
-        "https", base::WrapUnique(new FakeProtocolHandler(headers, response)));
+        "https", base::MakeUnique<FakeProtocolHandler>(headers, response));
     context_storage_.set_job_factory(std::move(factory));
   }
 };
 
 }  // namespace
 
 namespace remoting {
 
 class TokenValidatorFactoryImplTest : public testing::Test {
  public:
@@ skipping 13 matching lines @@
     EXPECT_TRUE(shared_secret.empty());
     token_validator_.reset();
     message_loop_.QuitWhenIdle();
   }
 
  protected:
   void SetUp() override {
     key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair);
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.task_runner(),
-        base::WrapUnique(new SetResponseURLRequestContext()));
+        base::MakeUnique<SetResponseURLRequestContext>());
     ThirdPartyAuthConfig config;
     config.token_url = GURL(kTokenUrl);
     config.token_validation_url = GURL(kTokenValidationUrl);
     config.token_validation_cert_issuer = kTokenValidationCertIssuer;
     token_validator_factory_ = new TokenValidatorFactoryImpl(
         config, key_pair_, request_context_getter_);
   }
 
   static std::string CreateResponse(const std::string& scope) {
     base::DictionaryValue response_dict;
@@ skipping 73 matching lines @@
   SetResponse(net::URLRequestTestJob::test_error_headers(), std::string());
 
   token_validator_->ValidateThirdPartyToken(
       kToken, base::Bind(
           &TokenValidatorFactoryImplTest::DeleteOnFailureCallback,
           base::Unretained(this)));
   base::RunLoop().Run();
 }
 
 }  // namespace remoting