Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_store.h"
@@ skipping 44 matching lines @@
 
   net::CookieList GetUserCookies();
   net::ChannelIDStore::ChannelIDList GetUserChannelIDs();
 
   void VerifyTransferredUserProxyAuthEntry();
   void VerifyUserCookies(const std::string& expected_gaia_cookie_value,
                          const std::string& expected_saml_idp_cookie_value);
   void VerifyUserChannelID(crypto::ECPrivateKey* expected_key);
 
  protected:
-  scoped_ptr<crypto::ECPrivateKey> channel_id_key1_;
-  scoped_ptr<crypto::ECPrivateKey> channel_id_key2_;
+  std::unique_ptr<crypto::ECPrivateKey> channel_id_key1_;
+  std::unique_ptr<crypto::ECPrivateKey> channel_id_key2_;
 
  private:
-  void PopulateBrowserContext(content::BrowserContext* browser_context,
-                              const std::string& proxy_auth_password,
-                              const std::string& cookie_value,
-                              scoped_ptr<crypto::ECPrivateKey> channel_id_key);
+  void PopulateBrowserContext(
+      content::BrowserContext* browser_context,
+      const std::string& proxy_auth_password,
+      const std::string& cookie_value,
+      std::unique_ptr<crypto::ECPrivateKey> channel_id_key);
 
   net::URLRequestContext* GetRequestContext(
       content::BrowserContext* browser_context);
   net::HttpAuthCache* GetProxyAuth(content::BrowserContext* browser_context);
   net::CookieStore* GetCookies(content::BrowserContext* browser_context);
   net::ChannelIDStore* GetChannelIDs(content::BrowserContext* browser_context);
 
   void QuitLoop(const net::CookieList& ignored);
   void StoreCookieListAndQuitLoop(const net::CookieList& cookie_list);
   void StoreChannelIDListAndQuitLoop(
       const net::ChannelIDStore::ChannelIDList& channel_id_list);
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   TestingProfile login_browser_context_;
   TestingProfile user_browser_context_;
 
   net::CookieList user_cookie_list_;
   net::ChannelIDStore::ChannelIDList user_channel_id_list_;
 
-  scoped_ptr<base::RunLoop> run_loop_;
+  std::unique_ptr<base::RunLoop> run_loop_;
 };
 
 void ProfileAuthDataTest::SetUp() {
   channel_id_key1_.reset(crypto::ECPrivateKey::Create());
   channel_id_key2_.reset(crypto::ECPrivateKey::Create());
   PopulateBrowserContext(&login_browser_context_, kProxyAuthPassword1,
                          kCookieValue1,
-                         make_scoped_ptr(channel_id_key1_->Copy()));
+                         base::WrapUnique(channel_id_key1_->Copy()));
 }
 
 void ProfileAuthDataTest::PopulateUserBrowserContext() {
   PopulateBrowserContext(&user_browser_context_, kProxyAuthPassword2,
                          kCookieValue2,
-                         make_scoped_ptr(channel_id_key2_->Copy()));
+                         base::WrapUnique(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 63 matching lines @@
   ASSERT_EQ(1u, user_channel_ids.size());
   net::ChannelIDStore::ChannelID* channel_id = &user_channel_ids.front();
   EXPECT_EQ(kChannelIDServerIdentifier, channel_id->server_identifier());
   EXPECT_TRUE(net::KeysEqual(expected_key, channel_id->key()));
 }
 
 void ProfileAuthDataTest::PopulateBrowserContext(
     content::BrowserContext* browser_context,
     const std::string& proxy_auth_password,
     const std::string& cookie_value,
-    scoped_ptr<crypto::ECPrivateKey> channel_id_key) {
+    std::unique_ptr<crypto::ECPrivateKey> channel_id_key) {
   GetProxyAuth(browser_context)->Add(
       GURL(kProxyAuthURL),
       kProxyAuthRealm,
       net::HttpAuth::AUTH_SCHEME_BASIC,
       kProxyAuthChallenge,
       net::AuthCredentials(base::string16(),
                            base::ASCIIToUTF16(proxy_auth_password)),
       std::string());
 
   net::CookieStore* cookies = GetCookies(browser_context);
   // Ensure |cookies| is fully initialized.
   run_loop_.reset(new base::RunLoop);
   cookies->GetAllCookiesAsync(base::Bind(&ProfileAuthDataTest::QuitLoop,
                                          base::Unretained(this)));
   run_loop_->Run();
 
   cookies->SetCookieWithDetailsAsync(
       GURL(kSAMLIdPCookieURL), kCookieName, cookie_value, std::string(),
       std::string(), base::Time(), base::Time(), base::Time(), true, false,
       net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT,
       net::CookieStore::SetCookiesCallback());
   cookies->SetCookieWithDetailsAsync(
       GURL(kGAIACookieURL), kCookieName, cookie_value, std::string(),
       std::string(), base::Time(), base::Time(), base::Time(), true, false,
       net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT,
       net::CookieStore::SetCookiesCallback());
 
   GetChannelIDs(browser_context)
-      ->SetChannelID(make_scoped_ptr(new net::ChannelIDStore::ChannelID(
+      ->SetChannelID(base::WrapUnique(new net::ChannelIDStore::ChannelID(
           kChannelIDServerIdentifier, base::Time(),
           std::move(channel_id_key))));
 }
 
 net::URLRequestContext* ProfileAuthDataTest::GetRequestContext(
     content::BrowserContext* browser_context) {
   return browser_context->GetRequestContext()->GetURLRequestContext();
 }
 
 net::HttpAuthCache* ProfileAuthDataTest::GetProxyAuth(
@@ skipping 70 matching lines @@
   PopulateUserBrowserContext();
 
   Transfer(false, true);
 
   VerifyTransferredUserProxyAuthEntry();
   VerifyUserCookies(kCookieValue2, kCookieValue1);
   VerifyUserChannelID(channel_id_key2_.get());
 }
 
 }  // namespace chromeos