diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 15:42:39 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 15:42:39 +0000 |
| commit | ba3996771f6d19298ee655992b2f6291a314ea76 (patch) | |
| tree | e5d88f89e7e98aa6ee60af431dc5dfa426d727b2 /chrome/common/extensions/extension_unittest.cc | |
| parent | 44a91f51ec8dd8d1373e28ef6f3f0ab410db942f (diff) | |
| download | chromium_src-ba3996771f6d19298ee655992b2f6291a314ea76.zip chromium_src-ba3996771f6d19298ee655992b2f6291a314ea76.tar.gz chromium_src-ba3996771f6d19298ee655992b2f6291a314ea76.tar.bz2 | |
detect preferences errors
BUG=38352
TEST=none
Review URL: http://codereview.chromium.org/1120006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/extension_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index fc88ab3..e204dcb 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; |