Make //crypto factories return std::unique_ptr<>s

chrome/browser/chromeos/login/profile_auth_data_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 "chrome/browser/chromeos/login/profile_auth_data.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 92 matching lines @@
   TestingProfile login_browser_context_;
   TestingProfile user_browser_context_;
 
   net::CookieList user_cookie_list_;
   net::ChannelIDStore::ChannelIDList user_channel_id_list_;
 
   std::unique_ptr<base::RunLoop> run_loop_;
 };
 
 void ProfileAuthDataTest::SetUp() {
-  channel_id_key1_.reset(crypto::ECPrivateKey::Create());
-  channel_id_key2_.reset(crypto::ECPrivateKey::Create());
+  channel_id_key1_ = crypto::ECPrivateKey::Create();
+  channel_id_key2_ = crypto::ECPrivateKey::Create();
   PopulateBrowserContext(&login_browser_context_, kProxyAuthPassword1,
-                         kCookieValue1,
-                         base::WrapUnique(channel_id_key1_->Copy()));
+                         kCookieValue1, channel_id_key1_->Copy());
 }
 
 void ProfileAuthDataTest::PopulateUserBrowserContext() {
   PopulateBrowserContext(&user_browser_context_, kProxyAuthPassword2,
-                         kCookieValue2,
-                         base::WrapUnique(channel_id_key2_->Copy()));
+                         kCookieValue2, channel_id_key2_->Copy());
 }
 
 void ProfileAuthDataTest::Transfer(
     bool transfer_auth_cookies_and_channel_ids_on_first_login,
     bool transfer_saml_auth_cookies_on_subsequent_login) {
   base::RunLoop run_loop;
   ProfileAuthData::Transfer(
       login_browser_context_.GetRequestContext(),
       user_browser_context_.GetRequestContext(),
       transfer_auth_cookies_and_channel_ids_on_first_login,
@@ skipping 184 matching lines @@
   PopulateUserBrowserContext();
 
   Transfer(false, true);
 
   VerifyTransferredUserProxyAuthEntry();
   VerifyUserCookies(kCookieValue2, kCookieValue1);
   VerifyUserChannelID(channel_id_key2_.get());
 }
 
 }  // namespace chromeos