Update from https://crrev.com/333737

gpu/config/gpu_control_list.cc

 // Copyright (c) 2013 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 "gpu/config/gpu_control_list.h"
 
 #include "base/cpu.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 1305 matching lines @@
       control_list_logging_enabled_(false) {
 }
 
 GpuControlList::~GpuControlList() {
   Clear();
 }
 
 bool GpuControlList::LoadList(
     const std::string& json_context,
     GpuControlList::OsFilter os_filter) {
-  scoped_ptr<base::Value> root;
-  root.reset(base::JSONReader::Read(json_context));
+  scoped_ptr<base::Value> root(base::JSONReader::Read(json_context));
   if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY))
     return false;
 
   base::DictionaryValue* root_dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   DCHECK(root_dictionary);
   return LoadList(*root_dictionary, os_filter);
 }
 
 bool GpuControlList::LoadList(const base::DictionaryValue& parsed_json,
@@ skipping 173 matching lines @@
     const std::string& feature_name, int feature_id) {
   feature_map_[feature_name] = feature_id;
 }
 
 void GpuControlList::set_supports_feature_type_all(bool supported) {
   supports_feature_type_all_ = supported;
 }
 
 }  // namespace gpu