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

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix and add ::From Created 5 years, 2 months 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: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 00fcdc74fb103ab186cf71c0966cb0dffeef3257..050d4cdc611be303d1c50ec05a768b984317a7e2 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -364,15 +364,13 @@ class MockProviderVisitor
// We also parse the file into a dictionary to compare what we get back
// from the provider.
JSONStringValueDeserializer deserializer(json_data);
- base::Value* json_value = deserializer.Deserialize(NULL, NULL);
+ scoped_ptr<base::Value> json_value = deserializer.Deserialize(NULL, NULL);
if (!json_value || !json_value->IsType(base::Value::TYPE_DICTIONARY)) {
NOTREACHED() << "Unable to deserialize json data";
return -1;
} else {
- base::DictionaryValue* external_extensions =
- static_cast<base::DictionaryValue*>(json_value);
- prefs_.reset(external_extensions);
+ prefs_ = base::DictionaryValue::From(json_value.Pass());
}
// Reset our counter.

Powered by Google App Engine
This is Rietveld 408576698