Revert of Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions

chrome/browser/extensions/api/proxy/proxy_api.cc

 // Copyright (c) 2012 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.
 
 // Implementation of the Chrome Extensions Proxy Settings API.
 
 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
 
 #include <memory>
 #include <utility>
@@ skipping 78 matching lines @@
                                             std::move(args), GURL());
   }
 }
 
 ProxyPrefTransformer::ProxyPrefTransformer() {
 }
 
 ProxyPrefTransformer::~ProxyPrefTransformer() {
 }
 
-std::unique_ptr<base::Value> ProxyPrefTransformer::ExtensionToBrowserPref(
+base::Value* ProxyPrefTransformer::ExtensionToBrowserPref(
     const base::Value* extension_pref,
     std::string* error,
     bool* bad_message) {
   // When ExtensionToBrowserPref is called, the format of |extension_pref|
   // has been verified already by the extension API to match the schema
   // defined in the extension API JSON.
   CHECK(extension_pref->IsType(base::Value::Type::DICTIONARY));
   const base::DictionaryValue* config =
       static_cast<const base::DictionaryValue*>(extension_pref);
 
@@ skipping 13 matching lines @@
       !helpers::GetPacMandatoryFromExtensionPref(
           config, &pac_mandatory, error, bad_message) ||
       !helpers::GetPacUrlFromExtensionPref(
           config, &pac_url, error, bad_message) ||
       !helpers::GetPacDataFromExtensionPref(
           config, &pac_data, error, bad_message) ||
       !helpers::GetProxyRulesStringFromExtensionPref(
           config, &proxy_rules_string, error, bad_message) ||
       !helpers::GetBypassListFromExtensionPref(
           config, &bypass_list, error, bad_message)) {
-    return nullptr;
+    return NULL;
   }
 
   return helpers::CreateProxyConfigDict(mode_enum, pac_mandatory, pac_url,
                                         pac_data, proxy_rules_string,
-                                        bypass_list, error);
+                                        bypass_list, error)
+      .release();
 }
 
-std::unique_ptr<base::Value> ProxyPrefTransformer::BrowserToExtensionPref(
+base::Value* ProxyPrefTransformer::BrowserToExtensionPref(
     const base::Value* browser_pref) {
   CHECK(browser_pref->IsType(base::Value::Type::DICTIONARY));
 
   // This is a dictionary wrapper that exposes the proxy configuration stored in
   // the browser preferences.
   ProxyConfigDictionary config(
       static_cast<const base::DictionaryValue*>(browser_pref)
           ->CreateDeepCopy());
 
   ProxyPrefs::ProxyMode mode;
   if (!config.GetMode(&mode)) {
     LOG(ERROR) << "Cannot determine proxy mode.";
-    return nullptr;
+    return NULL;
   }
 
   // Build a new ProxyConfig instance as defined in the extension API.
   std::unique_ptr<base::DictionaryValue> extension_pref(
       new base::DictionaryValue);
 
   extension_pref->SetString(keys::kProxyConfigMode,
                             ProxyPrefs::ProxyModeToString(mode));
 
   switch (mode) {
     case ProxyPrefs::MODE_DIRECT:
     case ProxyPrefs::MODE_AUTO_DETECT:
     case ProxyPrefs::MODE_SYSTEM:
       // These modes have no further parameters.
       break;
     case ProxyPrefs::MODE_PAC_SCRIPT: {
       // A PAC URL either point to a PAC script or contain a base64 encoded
       // PAC script. In either case we build a PacScript dictionary as defined
       // in the extension API.
       base::DictionaryValue* pac_dict = helpers::CreatePacScriptDict(config);
       if (!pac_dict)
-        return nullptr;
+        return NULL;
       extension_pref->Set(keys::kProxyConfigPacScript, pac_dict);
       break;
     }
     case ProxyPrefs::MODE_FIXED_SERVERS: {
       // Build ProxyRules dictionary according to the extension API.
       base::DictionaryValue* proxy_rules_dict =
           helpers::CreateProxyRulesDict(config);
       if (!proxy_rules_dict)
-        return nullptr;
+        return NULL;
       extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
       break;
     }
     case ProxyPrefs::kModeCount:
       NOTREACHED();
   }
-  return extension_pref;
+  return extension_pref.release();
 }
 
 }  // namespace extensions