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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.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.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index ca343e7a5548a5df50a297cb42fd475261b8c5e4..8af07ca9b42612f4336b80a58937f3772f70cca8 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -38,9 +38,9 @@ bool GetProxyConfig(const PrefService* profile_prefs,
const NetworkState& network,
net::ProxyConfig* proxy_config,
::onc::ONCSource* onc_source) {
- scoped_ptr<ProxyConfigDictionary> proxy_dict =
- proxy_config::GetProxyConfigForNetwork(
- profile_prefs, local_state_prefs, network, onc_source);
+ std::unique_ptr<ProxyConfigDictionary> proxy_dict =
+ proxy_config::GetProxyConfigForNetwork(profile_prefs, local_state_prefs,
+ network, onc_source);
if (!proxy_dict)
return false;
return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(*proxy_dict,
@@ -240,7 +240,8 @@ void ProxyConfigServiceImpl::DetermineEffectiveConfigFromDefaultNetwork() {
PrefProxyConfigTrackerImpl::OnProxyConfigChanged(effective_config_state,
effective_config);
if (VLOG_IS_ON(1) && !update_pending()) { // Update was successful.
- scoped_ptr<base::DictionaryValue> config_dict(effective_config.ToValue());
+ std::unique_ptr<base::DictionaryValue> config_dict(
+ effective_config.ToValue());
VLOG(1) << this << ": Proxy changed: "
<< ProxyPrefs::ConfigStateToDebugString(active_config_state_)
<< ", " << *config_dict;

Powered by Google App Engine
This is Rietveld 408576698