Change PopDataAsValue to return a std::unique_ptr.

chromeos/dbus/shill_client_unittest_base.cc

 // Copyright (c) 2012 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 "chromeos/dbus/shill_client_unittest_base.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 307 matching lines @@
     std::unique_ptr<base::Value> value;
     // Variants in the dictionary can be basic types or string-to-string
     // dictinoary.
     switch (variant_reader.GetDataType()) {
       case dbus::Message::ARRAY:
         value.reset(PopStringToStringDictionary(&variant_reader));
         break;
       case dbus::Message::BOOL:
       case dbus::Message::INT32:
       case dbus::Message::STRING:
-        value.reset(dbus::PopDataAsValue(&variant_reader));
+        value = dbus::PopDataAsValue(&variant_reader);
         break;
       default:
         NOTREACHED();
     }
     ASSERT_TRUE(value.get());
     const base::Value* expected_value = NULL;
     EXPECT_TRUE(expected_dictionary->GetWithoutPathExpansion(key,
                                                              &expected_value));
     EXPECT_TRUE(value->Equals(expected_value));
   }
@@ skipping 124 matching lines @@
 
 void ShillClientUnittestBase::OnCallMethodWithErrorCallback(
     dbus::MethodCall* method_call,
     int timeout_ms,
     const dbus::ObjectProxy::ResponseCallback& response_callback,
     const dbus::ObjectProxy::ErrorCallback& error_callback) {
   OnCallMethod(method_call, timeout_ms, response_callback);
 }
 
 }  // namespace chromeos