| Index: chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
|
| diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
|
| index cc773da9e8de92e984abc13b0564c770710c4508..8f3f7b29ebaac30b2c97e301c3ca3691ec64b288 100644
|
| --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
|
| +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
|
| @@ -5,9 +5,9 @@
|
| #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
|
|
|
| #include <stdint.h>
|
| -
|
| #include <map>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| @@ -259,9 +259,7 @@ class IncidentReportingServiceTest : public testing::Test {
|
|
|
| // Boom (or fizzle).
|
| return profile_manager_.CreateTestingProfile(
|
| - profile_name,
|
| - prefs.Pass(),
|
| - base::ASCIIToUTF16(profile_name),
|
| + profile_name, std::move(prefs), base::ASCIIToUTF16(profile_name),
|
| 0, // avatar_id (unused)
|
| std::string(), // supervised_user_id (unused)
|
| TestingProfile::TestingFactories());
|
| @@ -288,9 +286,8 @@ class IncidentReportingServiceTest : public testing::Test {
|
| incident->set_path(kTestTrackedPrefPath);
|
| if (value)
|
| incident->set_atomic_value(value);
|
| - return make_scoped_ptr(
|
| - new safe_browsing::TrackedPreferenceIncident(incident.Pass(),
|
| - false /* is_personal */));
|
| + return make_scoped_ptr(new safe_browsing::TrackedPreferenceIncident(
|
| + std::move(incident), false /* is_personal */));
|
| }
|
|
|
| // Adds a test incident to the service.
|
| @@ -533,7 +530,8 @@ class IncidentReportingServiceTest : public testing::Test {
|
| FakeDownloadFinder::Create(
|
| base::Bind(&IncidentReportingServiceTest::OnDownloadFinderDestroyed,
|
| base::Unretained(this)),
|
| - binary_download.Pass(), non_binary_download.Pass(), callback));
|
| + std::move(binary_download), std::move(non_binary_download),
|
| + callback));
|
| }
|
|
|
| // A fake StartUpload implementation invoked by the service during operation.
|
| @@ -1389,7 +1387,7 @@ TEST_F(IncidentReportingServiceTest, CleanLegacyPruneState) {
|
| // Add a profile.
|
| Profile* profile =
|
| CreateProfile("profile1", EXTENDED_REPORTING_OPT_IN,
|
| - ON_PROFILE_ADDITION_NO_ACTION, incidents_sent.Pass());
|
| + ON_PROFILE_ADDITION_NO_ACTION, std::move(incidents_sent));
|
|
|
| // Let all tasks run.
|
| task_runner_->RunUntilIdle();
|
|
|