Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/ui/webui/nacl_ui.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.
 
 #include "chrome/browser/ui/webui/nacl_ui.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 310 matching lines @@
   pnacl_path_exists_ = is_valid;
   pnacl_version_string_ = *version;
   MaybeRespondToPage();
 }
 
 void CheckVersion(const base::FilePath& pnacl_path, std::string* version) {
   base::FilePath pnacl_json_path =
       pnacl_path.AppendASCII("pnacl_public_pnacl_json");
   JSONFileValueDeserializer deserializer(pnacl_json_path);
   std::string error;
-  scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, &error));
+  scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, &error);
   if (!root || !root->IsType(base::Value::TYPE_DICTIONARY))
     return;
 
   // Now try to get the field. This may leave version empty if the
   // the "get" fails (no key, or wrong type).
   static_cast<base::DictionaryValue*>(root.get())->GetStringASCII(
       "pnacl-version", version);
 }
 
 bool CheckPathAndVersion(std::string* version) {
@@ skipping 39 matching lines @@
 
 NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   content::RecordAction(UserMetricsAction("ViewAboutNaCl"));
 
   web_ui->AddMessageHandler(new NaClDomHandler());
 
   // Set up the about:nacl source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNaClUIHTMLSource());
 }