| Index: net/proxy/proxy_config.cc
|
| diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc
|
| index 2ac6de1b328439b85f2e04735942f460c21379c7..78d6ef3b9cfd5a253638ad0b5221106b893aab47 100644
|
| --- a/net/proxy/proxy_config.cc
|
| +++ b/net/proxy/proxy_config.cc
|
| @@ -4,9 +4,11 @@
|
|
|
| #include "net/proxy/proxy_config.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/logging.h"
|
| -#include "base/strings/string_util.h"
|
| #include "base/strings/string_tokenizer.h"
|
| +#include "base/strings/string_util.h"
|
| #include "base/values.h"
|
| #include "net/proxy/proxy_info.h"
|
|
|
| @@ -258,7 +260,7 @@ scoped_ptr<base::DictionaryValue> ProxyConfig::ToValue() const {
|
| AddProxyListToValue("ftp", proxy_rules_.proxies_for_ftp, dict2.get());
|
| AddProxyListToValue("fallback", proxy_rules_.fallback_proxies,
|
| dict2.get());
|
| - dict->Set("proxy_per_scheme", dict2.Pass());
|
| + dict->Set("proxy_per_scheme", std::move(dict2));
|
| break;
|
| }
|
| default:
|
| @@ -286,7 +288,7 @@ scoped_ptr<base::DictionaryValue> ProxyConfig::ToValue() const {
|
| // Output the source.
|
| dict->SetString("source", ProxyConfigSourceToString(source_));
|
|
|
| - return dict.Pass();
|
| + return dict;
|
| }
|
|
|
| } // namespace net
|
|
|