Make ValueDeserializer::Deserialize return scoped_ptr

chromeos/tools/onc_validator/onc_validator.cc

 // 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.
 
 #include <cstdio>
 #include <iostream>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_validator.h"
 
+// TODO Check why this file do not fail on default trybots
+// http://crbug.com/543919
+
 // Command line switches.
 const char kSwitchErrorOnUnknownField[] = "error-on-unknown-field";
 const char kSwitchErrorOnWrongRecommended[] = "error-on-wrong-recommended";
 const char kSwitchErrorOnMissingField[] = "error-on-missing-field";
 const char kSwitchManagedOnc[] = "managed-onc";
 const char kSwitchUserPolicy[] = "user-policy";
 const char kSwitchDevicePolicy[] = "device-policy";
 const char kSwitchUserImport[] = "user-import";
 
 const char* kSwitches[] = {
@@ skipping 56 matching lines @@
 }
 
 scoped_ptr<base::DictionaryValue> ReadDictionary(const std::string& filename) {
   base::FilePath path(filename);
   JSONFileValueDeserializer deserializer(path);
   deserializer.set_allow_trailing_comma(true);
 
   base::DictionaryValue* dict = NULL;
 
   std::string json_error;
-  base::Value* value = deserializer.Deserialize(NULL, &json_error);
+  base::Value* value = deserializer.Deserialize(NULL, &json_error).release();
+  // TODO(Olli Raula) possible memory leak http://crbug.com/543015
   if (!value) {
     LOG(ERROR) << "Couldn't json-deserialize file '" << filename
                << "': " << json_error;
     return make_scoped_ptr(dict);
   }
 
   if (!value->GetAsDictionary(&dict)) {
     LOG(ERROR) << "File '" << filename
                << "' does not contain a dictionary as expected, but type "
                << value->GetType();
@@ skipping 51 matching lines @@
     case chromeos::onc::Validator::VALID:
       return kStatusValid;
     case chromeos::onc::Validator::VALID_WITH_WARNINGS:
       return kStatusWarnings;
     case chromeos::onc::Validator::INVALID:
       return kStatusInvalid;
     default:
       CHECK(false);
   }
 }