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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
index fb49079491760bdde3ee66bdbe45a1ea4fa0e72d..9a11a9526f90173631819613cce7f947cdc67116 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -249,7 +249,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
new ProxyConfigServiceImpl(profile_prefs, &pref_service_));
proxy_config_service_ =
config_service_impl_->CreateTrackingProxyConfigService(
- scoped_ptr<net::ProxyConfigService>());
+ std::unique_ptr<net::ProxyConfigService>());
// CreateTrackingProxyConfigService triggers update of initial prefs proxy
// config by tracker to chrome proxy config service, so flush all pending
@@ -313,7 +313,7 @@ class ProxyConfigServiceImplTest : public testing::Test {
void InitConfigWithTestInput(const Input& input,
base::DictionaryValue* result) {
- scoped_ptr<base::DictionaryValue> new_config;
+ std::unique_ptr<base::DictionaryValue> new_config;
switch (input.mode) {
case MK_MODE(DIRECT):
new_config.reset(ProxyConfigDictionary::CreateDirect());
@@ -363,8 +363,8 @@ class ProxyConfigServiceImplTest : public testing::Test {
}
base::MessageLoop loop_;
- scoped_ptr<net::ProxyConfigService> proxy_config_service_;
- scoped_ptr<ProxyConfigServiceImpl> config_service_impl_;
+ std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
+ std::unique_ptr<ProxyConfigServiceImpl> config_service_impl_;
TestingPrefServiceSimple pref_service_;
user_prefs::TestingPrefServiceSyncable profile_prefs_;
@@ -508,10 +508,10 @@ TEST_F(ProxyConfigServiceImplTest, SharedEthernetAndUserPolicy) {
SetUpSharedEthernet();
SetUpProxyConfigService(&profile_prefs_);
- scoped_ptr<base::DictionaryValue> ethernet_policy(
+ std::unique_ptr<base::DictionaryValue> ethernet_policy(
chromeos::onc::ReadDictionaryFromJson(kEthernetPolicy));
- scoped_ptr<base::ListValue> network_configs(new base::ListValue);
+ std::unique_ptr<base::ListValue> network_configs(new base::ListValue);
network_configs->Append(ethernet_policy.release());
profile_prefs_.SetUserPref(prefs::kUseSharedProxies,
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/chromeos/resource_reporter/resource_reporter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698