diff options
author | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-21 17:53:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-21 17:53:07 +0000 |
commit | 51805a169e3ac961a84d6de222b0797cfff0f919 (patch) | |
tree | e66b0fb458a71a808fdb7bf880c6b1ed1882bcbe /src/privet/privet_handler_unittest.cc | |
parent | 76915d0ba35aeca907be1a500032b078152f05d4 (diff) | |
parent | 7f6484ff67f30f0ab78945d5125eb91770a7dabb (diff) | |
download | libweave-51805a169e3ac961a84d6de222b0797cfff0f919.tar.gz |
Merge "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" into aosp-master
Diffstat (limited to 'src/privet/privet_handler_unittest.cc')
-rw-r--r-- | src/privet/privet_handler_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/privet/privet_handler_unittest.cc b/src/privet/privet_handler_unittest.cc index 0c9f158..f0846f9 100644 --- a/src/privet/privet_handler_unittest.cc +++ b/src/privet/privet_handler_unittest.cc @@ -77,9 +77,8 @@ std::unique_ptr<base::DictionaryValue> StripDebugErrorDetails( auto result = value.CreateDeepCopy(); base::DictionaryValue* error_dict = nullptr; EXPECT_TRUE(result->GetDictionary(path_to_error_object, &error_dict)); - scoped_ptr<base::Value> dummy; - error_dict->RemovePath("error.debugInfo", &dummy); - error_dict->RemovePath("error.message", &dummy); + error_dict->RemovePath("error.debugInfo", nullptr); + error_dict->RemovePath("error.message", nullptr); return result; } |