| Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| index d0a1c1987eccc93ee817b33dd125a7ab82a64dad..914c22ba7484d699bd6abf7319898dc562e266cc 100644
|
| --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| @@ -38,15 +38,15 @@ const char kDisplayDispositionMetric[] = "PasswordBubble.DisplayDisposition";
|
| // A helper class that will create FakeURLFetcher and record the requested URLs.
|
| class TestURLFetcherCallback {
|
| public:
|
| - scoped_ptr<net::FakeURLFetcher> CreateURLFetcher(
|
| + std::unique_ptr<net::FakeURLFetcher> CreateURLFetcher(
|
| const GURL& url,
|
| net::URLFetcherDelegate* d,
|
| const std::string& response_data,
|
| net::HttpStatusCode response_code,
|
| net::URLRequestStatus::Status status) {
|
| OnRequestDone(url);
|
| - return scoped_ptr<net::FakeURLFetcher>(new net::FakeURLFetcher(
|
| - url, d, response_data, response_code, status));
|
| + return std::unique_ptr<net::FakeURLFetcher>(
|
| + new net::FakeURLFetcher(url, d, response_data, response_code, status));
|
| }
|
|
|
| MOCK_METHOD1(OnRequestDone, void(const GURL&));
|
| @@ -132,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest,
|
| ExecuteManagePasswordsCommand();
|
| EXPECT_TRUE(IsBubbleShowing());
|
|
|
| - scoped_ptr<base::HistogramSamples> samples(
|
| + std::unique_ptr<base::HistogramSamples> samples(
|
| GetSamples(kDisplayDispositionMetric));
|
| EXPECT_EQ(
|
| 0,
|
| @@ -159,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest,
|
| EXPECT_TRUE(ManagePasswordsBubbleView::manage_password_bubble()->
|
| CanActivate());
|
|
|
| - scoped_ptr<base::HistogramSamples> samples(
|
| + std::unique_ptr<base::HistogramSamples> samples(
|
| GetSamples(kDisplayDispositionMetric));
|
| EXPECT_EQ(
|
| 1,
|
| @@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest,
|
| ExecuteManagePasswordsCommand();
|
| EXPECT_TRUE(IsBubbleShowing());
|
|
|
| - scoped_ptr<base::HistogramSamples> samples(
|
| + std::unique_ptr<base::HistogramSamples> samples(
|
| GetSamples(kDisplayDispositionMetric));
|
| EXPECT_EQ(
|
| 1,
|
| @@ -207,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest,
|
| ExecuteManagePasswordsCommand();
|
| EXPECT_TRUE(IsBubbleShowing());
|
|
|
| - scoped_ptr<base::HistogramSamples> samples(
|
| + std::unique_ptr<base::HistogramSamples> samples(
|
| GetSamples(kDisplayDispositionMetric));
|
| EXPECT_EQ(
|
| 1,
|
| @@ -284,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, TwoTabsWithBubble) {
|
|
|
| IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, AutoSignin) {
|
| base::FeatureList::ClearInstanceForTesting();
|
| - scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| + std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
| features::kCredentialManagementAPI.name, std::string());
|
| base::FeatureList::SetInstance(std::move(feature_list));
|
|
|