| Index: components/variations/service/variations_service_unittest.cc
|
| diff --git a/components/variations/service/variations_service_unittest.cc b/components/variations/service/variations_service_unittest.cc
|
| index a0a02202e4e165231aaf9d98f04f7bdeaa6eecbb..10dabefb1c30ecdbeb3ba8f02959f797215bb988 100644
|
| --- a/components/variations/service/variations_service_unittest.cc
|
| +++ b/components/variations/service/variations_service_unittest.cc
|
| @@ -5,7 +5,7 @@
|
| #include "components/variations/service/variations_service.h"
|
|
|
| #include <stddef.h>
|
| -
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/base64.h"
|
| @@ -80,7 +80,7 @@ class TestVariationsService : public VariationsService {
|
| scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier,
|
| PrefService* local_state)
|
| : VariationsService(make_scoped_ptr(new TestVariationsServiceClient()),
|
| - test_notifier.Pass(),
|
| + std::move(test_notifier),
|
| local_state,
|
| NULL,
|
| UIStringOverrider()),
|
| @@ -360,7 +360,7 @@ TEST_F(VariationsServiceTest, GetVariationsServerURL) {
|
| make_scoped_ptr(new TestVariationsServiceClient());
|
| TestVariationsServiceClient* raw_client = client.get();
|
| VariationsService service(
|
| - client.Pass(),
|
| + std::move(client),
|
| make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
|
| &prefs, NULL, UIStringOverrider());
|
| GURL url = service.GetVariationsServerURL(&prefs, std::string());
|
| @@ -414,7 +414,7 @@ TEST_F(VariationsServiceTest, RequestsInitiallyNotAllowed) {
|
| scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
|
| make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs));
|
| web_resource::TestRequestAllowedNotifier* raw_notifier = test_notifier.get();
|
| - TestVariationsService test_service(test_notifier.Pass(), &prefs);
|
| + TestVariationsService test_service(std::move(test_notifier), &prefs);
|
|
|
| // Force the notifier to initially disallow requests.
|
| raw_notifier->SetRequestsAllowedOverride(false);
|
| @@ -434,7 +434,7 @@ TEST_F(VariationsServiceTest, RequestsInitiallyAllowed) {
|
| scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
|
| make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs));
|
| web_resource::TestRequestAllowedNotifier* raw_notifier = test_notifier.get();
|
| - TestVariationsService test_service(test_notifier.Pass(), &prefs);
|
| + TestVariationsService test_service(std::move(test_notifier), &prefs);
|
|
|
| raw_notifier->SetRequestsAllowedOverride(true);
|
| test_service.StartRepeatedVariationsSeedFetch();
|
|
|