diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 22:14:46 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 22:14:46 +0000 |
| commit | 88e7284573598db75013dbcbd9debb311b1e255c (patch) | |
| tree | 461d3f5f16f91ea1297e682b1af86223b04850c4 /chrome/test/ui/ui_test.cc | |
| parent | 0649e694427d24bdfe7fec6835a44cff674a8325 (diff) | |
| download | chromium_src-88e7284573598db75013dbcbd9debb311b1e255c.zip chromium_src-88e7284573598db75013dbcbd9debb311b1e255c.tar.gz chromium_src-88e7284573598db75013dbcbd9debb311b1e255c.tar.bz2 | |
Add error messages to JSONReader and friends. This required a bit of refactoring to do cleanly. This CL doesn't actually use this capability anywhere except for unit tests. I will add that in a future CL.
Review URL: http://codereview.chromium.org/13169
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 415533e..5b549a0 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -463,7 +463,7 @@ static DictionaryValue* LoadDictionaryValueFromPath(const std::wstring& path) { JSONFileValueSerializer serializer(path); Value* root_value = NULL; - if (serializer.Deserialize(&root_value) && + if (serializer.Deserialize(&root_value, NULL) && root_value->GetType() != Value::TYPE_DICTIONARY) { delete root_value; return NULL; |