Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

components/proxy_config/proxy_config_dictionary.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_
 #define COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 13 matching lines @@
 // in the user preferences. The dictionary has the following structure:
 // {
 //   mode: string,
 //   server: string,
 //   pac_url: string,
 //   bypass_list: string
 // }
 // See proxy_config_dictionary.cc for the structure of the respective strings.
 class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
  public:
+  explicit ProxyConfigDictionary(std::unique_ptr<base::DictionaryValue> dict);

[vabr (Chromium), 2017/03/30 12:07:41]

stevenjb@ -- if you are wondering why I added this constructor, please see the
discussion in the CL; I'm happy to implement alternatives if you want me to.

[stevenjb, 2017/03/30 17:00:58]

I'm a little uncomfortable with having two such similar constructors.

How bad would it be to remove the current constructor and use CreateDeepCopy()
to do any copies at the call sites?

[vabr (Chromium), 2017/03/30 17:04:21]

That's no problem. I like that idea better than the 2 constructors. Not at my
developers machine at the moment, but as soon as I am, I will do that and ping
this CL.

   // Creates a deep copy of |dict| and leaves ownership to caller.
   explicit ProxyConfigDictionary(const base::DictionaryValue* dict);
   ~ProxyConfigDictionary();
 
   bool GetMode(ProxyPrefs::ProxyMode* out) const;
   bool GetPacUrl(std::string* out) const;
   bool GetPacMandatory(bool* out) const;
   bool GetProxyServer(std::string* out) const;
   bool GetBypassList(std::string* out) const;
   bool HasBypassList() const;
 
   const base::DictionaryValue& GetDictionary() const;
 
-  static base::DictionaryValue* CreateDirect();
-  static base::DictionaryValue* CreateAutoDetect();
-  static base::DictionaryValue* CreatePacScript(const std::string& pac_url,
-                                                bool pac_mandatory);
-  static base::DictionaryValue* CreateFixedServers(
+  static std::unique_ptr<base::DictionaryValue> CreateDirect();
+  static std::unique_ptr<base::DictionaryValue> CreateAutoDetect();
+  static std::unique_ptr<base::DictionaryValue> CreatePacScript(
+      const std::string& pac_url,
+      bool pac_mandatory);
+  static std::unique_ptr<base::DictionaryValue> CreateFixedServers(
       const std::string& proxy_server,
       const std::string& bypass_list);
-  static base::DictionaryValue* CreateSystem();
+  static std::unique_ptr<base::DictionaryValue> CreateSystem();
 
   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
   // Used to generate the |proxy_server| arg for CreateFixedServers().
   static void EncodeAndAppendProxyServer(const std::string& url_scheme,
                                          const net::ProxyServer& server,
                                          std::string* spec);
 
  private:
-  static base::DictionaryValue* CreateDictionary(
+  static std::unique_ptr<base::DictionaryValue> CreateDictionary(
       ProxyPrefs::ProxyMode mode,
       const std::string& pac_url,
       bool pac_mandatory,
       const std::string& proxy_server,
       const std::string& bypass_list);
 
   std::unique_ptr<base::DictionaryValue> dict_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigDictionary);
 };
 
 #endif  // COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_