chrome/browser/password_manager: scoped_ptr -> unique_ptr

chrome/browser/password_manager/password_manager_test_base.cc

 // Copyright 2015 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/password_manager/password_manager_test_base.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 152 matching lines @@
   void AcceptUpdatePromptImpl(
       const autofill::PasswordForm& form) const override {
     passwords_model_delegate_->UpdatePassword(form);
     EXPECT_FALSE(IsShowingUpdatePrompt());
   }
   PasswordsModelDelegate* const passwords_model_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleObserver);
 };
 
-scoped_ptr<PromptObserver> PromptObserver::Create(
+std::unique_ptr<PromptObserver> PromptObserver::Create(
     content::WebContents* web_contents) {
   if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
-    return scoped_ptr<PromptObserver>(new BubbleObserver(web_contents));
+    return std::unique_ptr<PromptObserver>(new BubbleObserver(web_contents));
   } else {
-    return scoped_ptr<PromptObserver>(new InfoBarObserver(web_contents));
+    return std::unique_ptr<PromptObserver>(new InfoBarObserver(web_contents));
   }
 }
 
 PasswordManagerBrowserTestBase::PasswordManagerBrowserTestBase() {
 }
 PasswordManagerBrowserTestBase::~PasswordManagerBrowserTestBase() {
 }
 
 void PasswordManagerBrowserTestBase::SetUpOnMainThread() {
   // Use TestPasswordStore to remove a possible race. Normally the
@@ skipping 36 matching lines @@
     const std::string& expected_value) {
   password_manager::TestPasswordStore* password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS).get());
   EXPECT_TRUE(password_store->IsEmpty());
 
   NavigateToFile(filename);
 
   NavigationObserver observer(WebContents());
-  scoped_ptr<PromptObserver> prompt_observer(
+  std::unique_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), submission_script));
   observer.Wait();
 
   prompt_observer->Accept();
 
   // Spin the message loop to make sure the password store had a chance to save
   // the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
@@ skipping 89 matching lines @@
       "  var element = document.getElementById('%s');"
       "window.domAutomationController.send(element && element.value == '%s');",
       iframe_id.c_str(), iframe_id.c_str(), element_id.c_str(),
       element_id.c_str(), expected_value.c_str());
   bool return_value = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       RenderViewHost(), value_check_script, &return_value));
   EXPECT_TRUE(return_value) << "element_id = " << element_id
                             << ", expected_value = " << expected_value;
 }