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

Unified Diff: extensions/browser/extension_icon_image_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: extensions/browser/extension_icon_image_unittest.cc
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc
index 88c2fe41003ce6effb024a37c067658c7c2e97cd..966d444ab391dc8e65e17b18324daeb921b5727a 100644
--- a/extensions/browser/extension_icon_image_unittest.cc
+++ b/extensions/browser/extension_icon_image_unittest.cc
@@ -104,9 +104,8 @@ class ExtensionIconImageTest : public ExtensionsTest,
std::string error;
JSONFileValueDeserializer deserializer(
test_file.AppendASCII("manifest.json"));
- scoped_ptr<base::DictionaryValue> valid_value(
- static_cast<base::DictionaryValue*>(
- deserializer.Deserialize(&error_code, &error)));
+ scoped_ptr<base::DictionaryValue> valid_value =
+ base::DictionaryValue::From(deserializer.Deserialize(NULL, &error));
Lei Zhang 2015/10/14 16:55:35 This used to pass in |error_code|
EXPECT_EQ(0, error_code) << error;
if (error_code != 0)
return NULL;

Powered by Google App Engine
This is Rietveld 408576698