summaryrefslogtreecommitdiffstats
path: root/dbus/property_unittest.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 06:55:53 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 06:55:53 +0000
commitba4ce1c8f606c3b428964ee4afe44d9330a8a7df (patch)
tree9eb814e34f12d0d7b991ee326ceead076e40157b /dbus/property_unittest.cc
parentd6de85d1bc698d5269c4046a9e4a70206053a726 (diff)
downloadchromium_src-ba4ce1c8f606c3b428964ee4afe44d9330a8a7df.zip
chromium_src-ba4ce1c8f606c3b428964ee4afe44d9330a8a7df.tar.gz
chromium_src-ba4ce1c8f606c3b428964ee4afe44d9330a8a7df.tar.bz2
dbus: Fix a bunch of memory leaks in dbus_unittests
BUG=none TEST=time tools/valgrind/valgrind.sh --leak-check=full out/Release/dbus_unittests Review URL: https://chromiumcodereview.appspot.com/10454083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/property_unittest.cc')
-rw-r--r--dbus/property_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/dbus/property_unittest.cc b/dbus/property_unittest.cc
index bd37a53..052d98b 100644
--- a/dbus/property_unittest.cc
+++ b/dbus/property_unittest.cc
@@ -76,9 +76,10 @@ class PropertyTest : public testing::Test {
ASSERT_TRUE(bus_->HasDBusThread());
// Create the properties structure
- properties_ = new Properties(object_proxy_,
- base::Bind(&PropertyTest::OnPropertyChanged,
- base::Unretained(this)));
+ properties_.reset(new Properties(
+ object_proxy_,
+ base::Bind(&PropertyTest::OnPropertyChanged,
+ base::Unretained(this))));
properties_->ConnectSignals();
properties_->GetAll();
}
@@ -141,7 +142,7 @@ class PropertyTest : public testing::Test {
scoped_ptr<base::Thread> dbus_thread_;
scoped_refptr<dbus::Bus> bus_;
dbus::ObjectProxy* object_proxy_;
- Properties* properties_;
+ scoped_ptr<Properties> properties_;
scoped_ptr<dbus::TestService> test_service_;
// Properties updated.
std::vector<std::string> updated_properties_;