| Index: chrome/browser/password_manager/password_manager_test_base.cc
|
| diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc
|
| index fdc641aa3a4fafef574ac7c233226b7a0275e3ce..bdd32c30805a8791188e7087e8533922a8cab090 100644
|
| --- a/chrome/browser/password_manager/password_manager_test_base.cc
|
| +++ b/chrome/browser/password_manager/password_manager_test_base.cc
|
| @@ -170,12 +170,12 @@ class BubbleObserver : public PromptObserver {
|
| 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));
|
| }
|
| }
|
|
|
| @@ -232,7 +232,7 @@ void PasswordManagerBrowserTestBase::VerifyPasswordIsSavedAndFilled(
|
| 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();
|
|
|