Make ValueDeserializer::Deserialize return scoped_ptr

extensions/browser/image_loader_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/image_loader.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 65 matching lines @@
     base::FilePath extension_dir;
     if (!PathService::Get(DIR_TEST_DATA, &extension_dir)) {
       EXPECT_FALSE(true);
       return NULL;
     }
     extension_dir = extension_dir.AppendASCII(dir_name);
     int error_code = 0;
     std::string error;
     JSONFileValueDeserializer deserializer(
         extension_dir.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]

ditto re: |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(
         extension_dir, location, *valid_value, Extension::NO_FLAGS, &error);
@@ skipping 203 matching lines @@
 
   const gfx::ImageSkiaRep* img_rep1 = &image_reps[0];
   const gfx::ImageSkiaRep* img_rep2 = &image_reps[1];
   EXPECT_EQ(extension_misc::EXTENSION_ICON_BITTY, img_rep1->pixel_width());
   EXPECT_EQ(1.0f, img_rep1->scale());
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH, img_rep2->pixel_width());
   EXPECT_EQ(2.0f, img_rep2->scale());
 }
 
 }  // namespace extensions