summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 23:57:29 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 23:57:29 +0000
commitb47c0ebf205aacdc78589e3ae995a14f019603ca (patch)
tree2a1b0ed0c6ff00fdd0bce6ef2b622f6ea1fa4861
parent5929dd2a564c9e8f820c35497b2ca402c7b9a610 (diff)
downloadchromium_src-b47c0ebf205aacdc78589e3ae995a14f019603ca.zip
chromium_src-b47c0ebf205aacdc78589e3ae995a14f019603ca.tar.gz
chromium_src-b47c0ebf205aacdc78589e3ae995a14f019603ca.tar.bz2
Fixed memory leaks in new unittests
TEST=heapcheck with remoting_unittest BUG=None TBR: ajwong git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55003 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/host/heartbeat_sender_unittest.cc3
-rw-r--r--remoting/host/host_key_pair_unittest.cc2
2 files changed, 5 insertions, 0 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 6ac2037..f5877e1 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -72,6 +72,9 @@ class HeartbeatSenderTest : public testing::Test {
NewRunnableMethod(config_updater.get(), &TestConfigUpdater::DoUpdate,
config_));
+ // Run the message loop to save new config.
+ message_loop_.RunAllPending();
+
jingle_thread_.message_loop_ = &message_loop_;
jingle_client_ = new MockJingleClient(&jingle_thread_);
diff --git a/remoting/host/host_key_pair_unittest.cc b/remoting/host/host_key_pair_unittest.cc
index e5af756..c5d525e 100644
--- a/remoting/host/host_key_pair_unittest.cc
+++ b/remoting/host/host_key_pair_unittest.cc
@@ -52,6 +52,8 @@ TEST_F(HostKeyPairTest, SaveLoad) {
exported_key.LoadFromString(kTestHostKeyPair);
exported_key.Save(config_);
+ message_loop_.RunAllPending();
+
HostKeyPair imported_key;
imported_key.Load(config_);