Make ValueDeserializer::Deserialize return scoped_ptr

extensions/browser/extension_icon_image_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 86 matching lines @@
     base::FilePath test_file;
     if (!PathService::Get(DIR_TEST_DATA, &test_file)) {
       EXPECT_FALSE(true);
       return NULL;
     }
     test_file = test_file.AppendASCII(name);
     int error_code = 0;
     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;
 
     EXPECT_TRUE(valid_value.get());
     if (!valid_value)
       return NULL;
 
     return Extension::Create(test_file, location, *valid_value,
                              Extension::NO_FLAGS, &error);
@@ skipping 424 matching lines @@
   // because image storage is shared, so when we created one from the first
   // image, all other images should also have that representation...
   gfx::Image image2 = icon_image->image();
   EXPECT_EQ(image_as_png.get(), image2.As1xPNGBytes().get());
 
   // ...even images that were copied before the representation was constructed.
   EXPECT_EQ(image_as_png.get(), prior_image.As1xPNGBytes().get());
 }
 
 }  // namespace extensions