Make ValueDeserializer::Deserialize return scoped_ptr

remoting/host/pairing_registry_delegate_linux.cc

Index: remoting/host/pairing_registry_delegate_linux.cc
diff --git a/remoting/host/pairing_registry_delegate_linux.cc b/remoting/host/pairing_registry_delegate_linux.cc
index 7b22721e7cb54f78217806ae5b1956ee9dfccd08..cf5125505f9a1b411abefcee77593fc399780f79 100644
--- a/remoting/host/pairing_registry_delegate_linux.cc
+++ b/remoting/host/pairing_registry_delegate_linux.cc
@@ -49,8 +49,8 @@ scoped_ptr<base::ListValue> PairingRegistryDelegateLinux::LoadAll() {
     JSONFileValueDeserializer deserializer(pairing_file);
     int error_code;
     std::string error_message;
-    scoped_ptr<base::Value> pairing_json(
-        deserializer.Deserialize(&error_code, &error_message));
+    scoped_ptr<base::Value> pairing_json =
+        deserializer.Deserialize(&error_code, &error_message);
     if (!pairing_json) {
       LOG(WARNING) << "Failed to load '" << pairing_file.value() << "' ("
                    << error_code << ").";
@@ -88,8 +88,8 @@ PairingRegistry::Pairing PairingRegistryDelegateLinux::Load(
   JSONFileValueDeserializer deserializer(pairing_file);
   int error_code;
   std::string error_message;
-  scoped_ptr<base::Value> pairing(
-      deserializer.Deserialize(&error_code, &error_message));
+  scoped_ptr<base::Value> pairing =
+      deserializer.Deserialize(&error_code, &error_message);
   if (!pairing) {
     LOG(WARNING) << "Failed to load pairing information: " << error_message
                  << " (" << error_code << ").";