Fix memory leak and crash when parsing baked-in configs in domain reliability monitor.

components/domain_reliability/config.cc

 // Copyright 2014 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.
 
 // Make sure stdint.h includes SIZE_MAX. (See C89, p259, footnote 221.)
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
 #endif
 
 #include "components/domain_reliability/config.h"
@@ skipping 76 matching lines @@
 }
 
 DomainReliabilityConfig::DomainReliabilityConfig() : valid_until(0.0) {}
 DomainReliabilityConfig::~DomainReliabilityConfig() {}
 
 // static
 scoped_ptr<const DomainReliabilityConfig> DomainReliabilityConfig::FromJSON(
     const base::StringPiece& json) {
   scoped_ptr<base::Value> value(base::JSONReader::Read(json));
   base::JSONValueConverter<DomainReliabilityConfig> converter;
-  DomainReliabilityConfig* config = new DomainReliabilityConfig();
+  scoped_ptr<DomainReliabilityConfig> config(new DomainReliabilityConfig());
 
   // If we can parse and convert the JSON into a valid config, return that.
-  if (value && converter.Convert(*value, config) && config->IsValid())
-    return scoped_ptr<const DomainReliabilityConfig>(config);
-  else
-    return scoped_ptr<const DomainReliabilityConfig>();
+  if (value && converter.Convert(*value, config.get()) && config->IsValid())
+    return config.Pass();
+  return scoped_ptr<const DomainReliabilityConfig>();
 }
 
 bool DomainReliabilityConfig::IsValid() const {
   if (valid_until == 0.0 || domain.empty() ||
       resources.empty() || collectors.empty()) {
     return false;
   }
 
   for (size_t i = 0; i < resources.size(); ++i) {
     if (!resources[i]->IsValid())
@@ skipping 35 matching lines @@
                                  &DomainReliabilityConfig::valid_until);
   converter->RegisterStringField("monitored_domain",
                                  &DomainReliabilityConfig::domain);
   converter->RegisterRepeatedMessage("monitored_resources",
                                      &DomainReliabilityConfig::resources);
   converter->RegisterRepeatedMessage("collectors",
                                      &DomainReliabilityConfig::collectors);
 }
 
 }  // namespace domain_reliability