| Index: chrome/common/extensions/extension_unittest.cc
 | 
| diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
 | 
| index fc88ab3e1ef5e37f63099ea6b8c4d647610f42e0..e204dcbf1e421360ca3e25110b00354c6f1aaf4b 100644
 | 
| --- a/chrome/common/extensions/extension_unittest.cc
 | 
| +++ b/chrome/common/extensions/extension_unittest.cc
 | 
| @@ -50,6 +50,7 @@ TEST(ExtensionTest, InitFromValueInvalid) {
 | 
|    FilePath path(FILE_PATH_LITERAL("/foo"));
 | 
|  #endif
 | 
|    Extension extension(path);
 | 
| +  int error_code = 0;
 | 
|    std::string error;
 | 
|    ExtensionErrorReporter::Init(false);
 | 
|  
 | 
| @@ -65,8 +66,10 @@ TEST(ExtensionTest, InitFromValueInvalid) {
 | 
|  
 | 
|    JSONFileValueSerializer serializer(extensions_path);
 | 
|    scoped_ptr<DictionaryValue> valid_value(
 | 
| -      static_cast<DictionaryValue*>(serializer.Deserialize(&error)));
 | 
| +      static_cast<DictionaryValue*>(serializer.Deserialize(&error_code,
 | 
| +                                                           &error)));
 | 
|    EXPECT_EQ("", error);
 | 
| +  EXPECT_EQ(0, error_code);
 | 
|    ASSERT_TRUE(valid_value.get());
 | 
|    ASSERT_TRUE(extension.InitFromValue(*valid_value, true, &error));
 | 
|    ASSERT_EQ("", error);
 | 
| @@ -654,7 +657,7 @@ static Extension* LoadManifest(const std::string& dir,
 | 
|               .AppendASCII(test_file);
 | 
|  
 | 
|    JSONFileValueSerializer serializer(path);
 | 
| -  scoped_ptr<Value> result(serializer.Deserialize(NULL));
 | 
| +  scoped_ptr<Value> result(serializer.Deserialize(NULL, NULL));
 | 
|    if (!result.get())
 | 
|      return NULL;
 | 
|  
 | 
| 
 |