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

Unified Diff: chrome/browser/chromeos/ui_proxy_config_service.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/ui_proxy_config_service.cc
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc
index 7ce57d113fb270c1fe96addaccb530fb6e8ebe06..5f9b6f1cea5dd39d28a61ff61d9f5c58392afe4e 100644
--- a/chrome/browser/chromeos/ui_proxy_config_service.cc
+++ b/chrome/browser/chromeos/ui_proxy_config_service.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/chromeos/ui_proxy_config_service.h"
+#include <memory>
+
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/chromeos/net/proxy_config_handler.h"
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ -44,9 +45,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,
@@ -120,7 +121,7 @@ void UIProxyConfigService::SetProxyConfig(const UIProxyConfig& config) {
}
// Store config for this network.
- scoped_ptr<base::DictionaryValue> proxy_config_value(
+ std::unique_ptr<base::DictionaryValue> proxy_config_value(
config.ToPrefProxyConfig());
ProxyConfigDictionary proxy_config_dict(proxy_config_value.get());

Powered by Google App Engine
This is Rietveld 408576698