Change JSONReader::ReadToValue to return a scoped_ptr

chrome/test/chromedriver/chrome/mobile_device.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.
 
 #include "base/json/json_reader.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/mobile_device.h"
 #include "chrome/test/chromedriver/chrome/mobile_device_list.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 
 MobileDevice::MobileDevice() {}
 MobileDevice::~MobileDevice() {}
 
 Status FindMobileDevice(std::string device_name,
                         scoped_ptr<MobileDevice>* mobile_device) {
   base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS);
-  scoped_ptr<base::Value> devices_value;
-  devices_value.reset(json_reader.ReadToValue(kMobileDevices));
+  scoped_ptr<base::Value> devices_value =
+      json_reader.ReadToValue(kMobileDevices);
   if (!devices_value.get())
     return Status(kUnknownError,
                   "could not parse mobile device list because " +
                   json_reader.GetErrorMessage());
 
   base::ListValue* mobile_devices;
   if (!devices_value->GetAsList(&mobile_devices))
     return Status(kUnknownError, "malformed device metrics list");
 
   for (base::ListValue::iterator it = mobile_devices->begin();
@@ skipping 48 matching lines @@
       tmp_mobile_device->device_metrics.reset(
           new DeviceMetrics(width, height, device_scale_factor, touch, mobile));
 
       *mobile_device = tmp_mobile_device.Pass();
       return Status(kOk);
     }
   }
 
   return Status(kUnknownError, "must be a valid device");
 }