diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 16:51:56 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 16:51:56 +0000 |
| commit | f2452600de4fa9cfee6d388d246c04511e282105 (patch) | |
| tree | f966c40aa2cfef0f1c463f57fbac28441e4e2eda | |
| parent | be83271cfe88a8d9cb127967baf08b2a96b25c33 (diff) | |
| download | chromium_src-f2452600de4fa9cfee6d388d246c04511e282105.zip chromium_src-f2452600de4fa9cfee6d388d246c04511e282105.tar.gz chromium_src-f2452600de4fa9cfee6d388d246c04511e282105.tar.bz2 | |
Fix leaks in CloudPolicySubsystemTest
BUG=86135
TEST=linux heapcheck and valgrind bots stay green
Review URL: http://codereview.chromium.org/7170011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89202 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/policy/cloud_policy_subsystem_unittest.cc | 6 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 17 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 7 |
3 files changed, 3 insertions, 27 deletions
diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc index c883353..a8c0ffe 100644 --- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc +++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc @@ -45,7 +45,7 @@ const char kDMAuthHeader[] = "GoogleDMToken token=token123456"; const char kDMToken[] = "token123456"; const char kDeviceManagementUrl[] = - "http://localhost:12345/MessageLoopForUIdevice_management_test"; + "http://localhost:12345/device_management_test"; // Constant responses of the identity strategy. const char kMachineId[] = "dummy-cros-machine-123"; @@ -204,8 +204,8 @@ class CloudPolicySubsystemTest : public testing::Test { // Test conditions. EXPECT_EQ(CloudPolicySubsystem::SUCCESS, cloud_policy_subsystem_->state()); - VerifyPolicy(kPolicyHomepageLocation, - Value::CreateStringValue(homepage_location)); + StringValue homepage_value(homepage_location); + VerifyPolicy(kPolicyHomepageLocation, &homepage_value); VerifyServerLoad(); } diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 1d2bcd6..1735705 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1622,20 +1622,3 @@ ... fun:WebKitContextTest_Basic_Test::TestBody } -{ - bug_86135 - Heapcheck:Leak - fun:Value::CreateStringValue - fun:policy::CloudPolicySubsystemTest::ExecuteTest -} -{ - bug_86135_b - Heapcheck:Leak - fun:__gnu_cxx::new_allocator::allocate - fun:std::string::_Rep::_S_create - fun:std::string::_S_construct - fun:std::string::_S_construct_aux - fun:std::string::_S_construct - fun:std::basic_string::basic_string - fun:policy::CloudPolicySubsystemTest*::TestBody -} diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index eb51072..d424530 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -4643,13 +4643,6 @@ fun:_ZN28WebKitContextTest_Basic_Test8TestBodyEv } { - bug_86135 - Memcheck:Leak - fun:_Znw* - fun:_ZN5Value17CreateStringValueERKSs - fun:_ZN6policy24CloudPolicySubsystemTest11ExecuteTestERKSs -} -{ bug_86136 Memcheck:Leak fun:_Znw* |