Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: chromeos/dbus/shill_client_unittest_base.cc

Issue 11367048: This is the first pass at making GetIPConfigs asynchronous. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/dbus/shill_client_unittest_base.cc
diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc
index 1907cb09bb63888025f657caa8e4ca672a21610e..514153795523f669b6383f0e9344c0a31780068a 100644
--- a/chromeos/dbus/shill_client_unittest_base.cc
+++ b/chromeos/dbus/shill_client_unittest_base.cc
@@ -235,11 +235,11 @@ void ShillClientUnittestBase::ExpectObjectPathResultWithoutStatus(
// static
void ShillClientUnittestBase::ExpectDictionaryValueResultWithoutStatus(
const base::DictionaryValue* expected_result,
- const base::DictionaryValue& result) {
+ scoped_ptr<base::DictionaryValue> result) {
std::string expected_result_string;
base::JSONWriter::Write(expected_result, &expected_result_string);
std::string result_string;
- base::JSONWriter::Write(&result, &result_string);
+ base::JSONWriter::Write(result.get(), &result_string);
EXPECT_EQ(expected_result_string, result_string);
}
@@ -247,9 +247,9 @@ void ShillClientUnittestBase::ExpectDictionaryValueResultWithoutStatus(
void ShillClientUnittestBase::ExpectDictionaryValueResult(
const base::DictionaryValue* expected_result,
DBusMethodCallStatus call_status,
- const base::DictionaryValue& result) {
+ scoped_ptr<base::DictionaryValue> result) {
EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status);
- ExpectDictionaryValueResultWithoutStatus(expected_result, result);
+ ExpectDictionaryValueResultWithoutStatus(expected_result, result.Pass());
}
void ShillClientUnittestBase::OnConnectToSignal(

Powered by Google App Engine
This is Rietveld 408576698