dbus: Fix a bunch of memory leaks in dbus_unittests

dbus/values_util_unittest.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 "dbus/values_util.h"
 
 #include <vector>
 
 #include "base/float_util.h"
 #include "base/json/json_writer.h"
@@ skipping 26 matching lines @@
   writer.AppendDouble(kDoubleValue);
   const std::string kStringValue = "fifty";
   writer.AppendString(kStringValue);
   const std::string kEmptyStringValue;
   writer.AppendString(kEmptyStringValue);
   const dbus::ObjectPath kObjectPathValue("ObjectPath");
   writer.AppendObjectPath(kObjectPathValue);
 
   dbus::MessageReader reader(response.get());
   scoped_ptr<Value> value;
+  scoped_ptr<Value> expected_value;
   // Pop a byte.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateIntegerValue(kByteValue)));
+  expected_value.reset(Value::CreateIntegerValue(kByteValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a bool.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateBooleanValue(kBoolValue)));
+  expected_value.reset(Value::CreateBooleanValue(kBoolValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an int16.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateIntegerValue(kInt16Value)));
+  expected_value.reset(Value::CreateIntegerValue(kInt16Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a uint16.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateIntegerValue(kUint16Value)));
+  expected_value.reset(Value::CreateIntegerValue(kUint16Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an int32.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateIntegerValue(kInt32Value)));
+  expected_value.reset(Value::CreateIntegerValue(kInt32Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a uint32.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kUint32Value)));
+  expected_value.reset(Value::CreateDoubleValue(kUint32Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an int64.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kInt64Value)));
+  expected_value.reset(Value::CreateDoubleValue(kInt64Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a uint64.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kUint64Value)));
+  expected_value.reset(Value::CreateDoubleValue(kUint64Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a double.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kDoubleValue)));
+  expected_value.reset(Value::CreateDoubleValue(kDoubleValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a string.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateStringValue(kStringValue)));
+  expected_value.reset(Value::CreateStringValue(kStringValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an empty string.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateStringValue(kEmptyStringValue)));
+  expected_value.reset(Value::CreateStringValue(kEmptyStringValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an object path.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(
-      value->Equals(Value::CreateStringValue(kObjectPathValue.value())));
+  expected_value.reset(Value::CreateStringValue(
+      kObjectPathValue.value()));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
 }
 
 TEST(ValuesUtilTest, PopVariant) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Append variant values.
   dbus::MessageWriter writer(response.get());
   const bool kBoolValue = true;
   writer.AppendVariantOfBool(kBoolValue);
   const int32 kInt32Value = -45;
   writer.AppendVariantOfInt32(kInt32Value);
   const double kDoubleValue = 4.9;
   writer.AppendVariantOfDouble(kDoubleValue);
   const std::string kStringValue = "fifty";
   writer.AppendVariantOfString(kStringValue);
 
   dbus::MessageReader reader(response.get());
   scoped_ptr<Value> value;
+  scoped_ptr<Value> expected_value;
   // Pop a bool.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateBooleanValue(kBoolValue)));
+  expected_value.reset(Value::CreateBooleanValue(kBoolValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an int32.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateIntegerValue(kInt32Value)));
+  expected_value.reset(Value::CreateIntegerValue(kInt32Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a double.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kDoubleValue)));
+  expected_value.reset(Value::CreateDoubleValue(kDoubleValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop a string.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateStringValue(kStringValue)));
+  expected_value.reset(Value::CreateStringValue(kStringValue));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
 }
 
 // Pop extremely large integers which cannot be precisely represented in
 // double.
 TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Append large integers.
   dbus::MessageWriter writer(response.get());
   const int64 kInt64Value = -123456789012345689LL;
   writer.AppendInt64(kInt64Value);
   const uint64 kUint64Value = 9876543210987654321ULL;
   writer.AppendUint64(kUint64Value);
 
   dbus::MessageReader reader(response.get());
   scoped_ptr<Value> value;
+  scoped_ptr<Value> expected_value;
   double double_value = 0;
   // Pop an int64.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kInt64Value)));
+  expected_value.reset(Value::CreateDoubleValue(kInt64Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   ASSERT_TRUE(value->GetAsDouble(&double_value));
   EXPECT_NE(kInt64Value, static_cast<int64>(double_value));
   // Pop a uint64.
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(Value::CreateDoubleValue(kUint64Value)));
+  expected_value.reset(Value::CreateDoubleValue(kUint64Value));
+  EXPECT_TRUE(value->Equals(expected_value.get()));
   ASSERT_TRUE(value->GetAsDouble(&double_value));
   EXPECT_NE(kUint64Value, static_cast<uint64>(double_value));
 }
 
 TEST(ValuesUtilTest, PopIntArray) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Append an int32 array.
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter sub_writer(NULL);
   std::vector<int32> data;
   data.push_back(0);
   data.push_back(1);
   data.push_back(2);
   writer.OpenArray("i", &sub_writer);
   for (size_t i = 0; i != data.size(); ++i)
     sub_writer.AppendInt32(data[i]);
   writer.CloseContainer(&sub_writer);
 
   // Create the expected value.
-  ListValue* list_value = new ListValue;
+  scoped_ptr<ListValue> list_value(new ListValue);
   for (size_t i = 0; i != data.size(); ++i)
     list_value->Append(Value::CreateIntegerValue(data[i]));
 
   // Pop an int32 array.
   dbus::MessageReader reader(response.get());
   scoped_ptr<Value> value(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(list_value));
+  EXPECT_TRUE(value->Equals(list_value.get()));
 }
 
 TEST(ValuesUtilTest, PopStringArray) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Append a string array.
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter sub_writer(NULL);
   std::vector<std::string> data;
   data.push_back("Dreamlifter");
   data.push_back("Beluga");
   data.push_back("Mriya");
   writer.AppendArrayOfStrings(data);
 
   // Create the expected value.
-  ListValue* list_value = new ListValue;
+  scoped_ptr<ListValue> list_value(new ListValue);
   for (size_t i = 0; i != data.size(); ++i)
     list_value->Append(Value::CreateStringValue(data[i]));
 
   // Pop a string array.
   dbus::MessageReader reader(response.get());
   scoped_ptr<Value> value(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
-  EXPECT_TRUE(value->Equals(list_value));
+  EXPECT_TRUE(value->Equals(list_value.get()));
 }
 
 TEST(ValuesUtilTest, PopStruct) {
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Append a struct.
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter sub_writer(NULL);
   writer.OpenStruct(&sub_writer);
   const bool kBoolValue = true;
   sub_writer.AppendBool(kBoolValue);
@@ skipping 198 matching lines @@
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
   EXPECT_TRUE(value->Equals(&kIntegerValue));
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
   EXPECT_TRUE(value->Equals(&kDoubleValue));
   value.reset(dbus::PopDataAsValue(&reader));
   ASSERT_TRUE(value.get() != NULL);
   EXPECT_TRUE(value->Equals(&kStringValue));
 }