| 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,
|
|
|