Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/variations/service/variations_service_unittest.cc

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/user_prefs/tracked/interceptable_pref_filter.h ('K') | « components/variations/service/variations_service.cc ('k') | components/variations/variations_seed_processor_unittest.cc » ('j') | components/wifi/fake_wifi_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 edbb8ccd5a62a81a2d907a5f5e013bcd64b933df..d28b37b25825043ed9ed6b36740ef33ef8178ed7 100644
--- a/components/variations/service/variations_service_unittest.cc
+++ b/components/variations/service/variations_service_unittest.cc
@@ -5,6 +5,7 @@
#include "components/variations/service/variations_service.h"
#include <stddef.h>
+
#include <utility>
#include <vector>
@@ -12,6 +13,7 @@
#include "base/feature_list.h"
#include "base/json/json_string_value_serializer.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/sha1.h"
#include "base/strings/string_number_conversions.h"
@@ -77,9 +79,9 @@ class TestVariationsServiceClient : public VariationsServiceClient {
class TestVariationsService : public VariationsService {
public:
TestVariationsService(
- scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier,
+ std::unique_ptr<web_resource::TestRequestAllowedNotifier> test_notifier,
PrefService* local_state)
- : VariationsService(make_scoped_ptr(new TestVariationsServiceClient()),
+ : VariationsService(base::WrapUnique(new TestVariationsServiceClient()),
std::move(test_notifier),
local_state,
NULL,
@@ -266,7 +268,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromSeed) {
// Setup base::FeatureList.
base::FeatureList::ClearInstanceForTesting();
- base::FeatureList::SetInstance(make_scoped_ptr(new base::FeatureList()));
+ base::FeatureList::SetInstance(base::WrapUnique(new base::FeatureList()));
// Create a local base::FieldTrialList, to hold the field trials created in
// this test.
@@ -274,7 +276,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromSeed) {
// Create a variations service.
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.SetCreateTrialsFromSeedCalledForTesting(false);
@@ -297,7 +299,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromSeedNoLastFetchTime) {
// Setup base::FeatureList.
base::FeatureList::ClearInstanceForTesting();
- base::FeatureList::SetInstance(make_scoped_ptr(new base::FeatureList()));
+ base::FeatureList::SetInstance(base::WrapUnique(new base::FeatureList()));
// Create a local base::FieldTrialList, to hold the field trials created in
// this test.
@@ -305,7 +307,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromSeedNoLastFetchTime) {
// Create a variations service
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.SetCreateTrialsFromSeedCalledForTesting(false);
@@ -328,7 +330,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromOutdatedSeed) {
// Setup base::FeatureList.
base::FeatureList::ClearInstanceForTesting();
- base::FeatureList::SetInstance(make_scoped_ptr(new base::FeatureList()));
+ base::FeatureList::SetInstance(base::WrapUnique(new base::FeatureList()));
// Create a local base::FieldTrialList, to hold the field trials created in
// this test.
@@ -336,7 +338,7 @@ TEST_F(VariationsServiceTest, CreateTrialsFromOutdatedSeed) {
// Create a variations service.
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.SetCreateTrialsFromSeedCalledForTesting(false);
@@ -359,12 +361,12 @@ TEST_F(VariationsServiceTest, GetVariationsServerURL) {
VariationsService::GetDefaultVariationsServerURLForTesting();
std::string value;
- scoped_ptr<TestVariationsServiceClient> client =
- make_scoped_ptr(new TestVariationsServiceClient());
+ std::unique_ptr<TestVariationsServiceClient> client =
danakj 2016/04/25 18:32:58 include memory?
dcheng 2016/04/25 19:55:06 Done.
+ base::WrapUnique(new TestVariationsServiceClient());
TestVariationsServiceClient* raw_client = client.get();
VariationsService service(
std::move(client),
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs, NULL, UIStringOverrider());
GURL url = service.GetVariationsServerURL(&prefs, std::string());
EXPECT_TRUE(base::StartsWith(url.spec(), default_variations_url,
@@ -399,7 +401,7 @@ TEST_F(VariationsServiceTest, VariationsURLHasOSNameParam) {
TestingPrefServiceSimple prefs;
VariationsService::RegisterPrefs(prefs.registry());
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
const GURL url = service.GetVariationsServerURL(&prefs, std::string());
@@ -414,8 +416,8 @@ TEST_F(VariationsServiceTest, RequestsInitiallyNotAllowed) {
// Pass ownership to TestVariationsService, but keep a weak pointer to
// manipulate it for this test.
- scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs));
+ std::unique_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs));
web_resource::TestRequestAllowedNotifier* raw_notifier = test_notifier.get();
TestVariationsService test_service(std::move(test_notifier), &prefs);
@@ -434,8 +436,8 @@ TEST_F(VariationsServiceTest, RequestsInitiallyAllowed) {
// Pass ownership to TestVariationsService, but keep a weak pointer to
// manipulate it for this test.
- scoped_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs));
+ std::unique_ptr<web_resource::TestRequestAllowedNotifier> test_notifier =
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs));
web_resource::TestRequestAllowedNotifier* raw_notifier = test_notifier.get();
TestVariationsService test_service(std::move(test_notifier), &prefs);
@@ -449,7 +451,7 @@ TEST_F(VariationsServiceTest, SeedStoredWhenOKStatus) {
VariationsService::RegisterPrefs(prefs.registry());
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.set_intercepts_fetch(false);
@@ -478,7 +480,7 @@ TEST_F(VariationsServiceTest, SeedNotStoredWhenNonOKStatus) {
VariationsService::RegisterPrefs(prefs.registry());
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.set_intercepts_fetch(false);
for (size_t i = 0; i < arraysize(non_ok_status_codes); ++i) {
@@ -500,7 +502,7 @@ TEST_F(VariationsServiceTest, RequestGzipCompressedSeed) {
net::TestURLFetcherFactory factory;
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.set_intercepts_fetch(false);
service.DoActualFetch();
@@ -536,7 +538,7 @@ TEST_F(VariationsServiceTest, InstanceManipulations) {
for (size_t i = 0; i < arraysize(cases); ++i) {
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.set_intercepts_fetch(false);
service.DoActualFetch();
@@ -560,7 +562,7 @@ TEST_F(VariationsServiceTest, CountryHeader) {
VariationsService::RegisterPrefs(prefs.registry());
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
service.set_intercepts_fetch(false);
@@ -583,8 +585,8 @@ TEST_F(VariationsServiceTest, Observer) {
TestingPrefServiceSimple prefs;
VariationsService::RegisterPrefs(prefs.registry());
VariationsService service(
- make_scoped_ptr(new TestVariationsServiceClient()),
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new TestVariationsServiceClient()),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs, NULL, UIStringOverrider());
struct {
@@ -683,8 +685,8 @@ TEST_F(VariationsServiceTest, LoadPermanentConsistencyCountry) {
TestingPrefServiceSimple prefs;
VariationsService::RegisterPrefs(prefs.registry());
VariationsService service(
- make_scoped_ptr(new TestVariationsServiceClient()),
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new TestVariationsServiceClient()),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs, NULL, UIStringOverrider());
if (test.pref_value_before) {
@@ -755,7 +757,7 @@ TEST_F(VariationsServiceTest, OverrideStoredPermanentCountry) {
TestingPrefServiceSimple prefs;
VariationsService::RegisterPrefs(prefs.registry());
TestVariationsService service(
- make_scoped_ptr(new web_resource::TestRequestAllowedNotifier(&prefs)),
+ base::WrapUnique(new web_resource::TestRequestAllowedNotifier(&prefs)),
&prefs);
if (!test.pref_value_before.empty()) {
« components/user_prefs/tracked/interceptable_pref_filter.h ('K') | « components/variations/service/variations_service.cc ('k') | components/variations/variations_seed_processor_unittest.cc » ('j') | components/wifi/fake_wifi_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698