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/installer | |
| 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/installer')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/master_preferences.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 64c432b..7029fef0 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -193,7 +193,7 @@ bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile( JSONFileValueSerializer json_serializer(FilePath::FromWStringHack(file_path)); std::string json_error_string; - scoped_ptr<Value> root(json_serializer.Deserialize(NULL)); + scoped_ptr<Value> root(json_serializer.Deserialize(NULL, NULL)); if (!root.get()) return false; diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc index 0df160c..cc63e00 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -217,7 +217,7 @@ TEST_F(GoogleChromeDistributionTest, TestExtractUninstallMetrics) { JSONStringValueSerializer json_deserializer(pref_string); std::string error_message; - scoped_ptr<Value> root(json_deserializer.Deserialize(&error_message)); + scoped_ptr<Value> root(json_deserializer.Deserialize(NULL, &error_message)); ASSERT_TRUE(root.get()); std::wstring uninstall_metrics_string; diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index 3406e33..e78872e 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -169,7 +169,7 @@ DictionaryValue* ParseDistributionPreferences( return NULL; JSONStringValueSerializer json(json_data); - scoped_ptr<Value> root(json.Deserialize(NULL)); + scoped_ptr<Value> root(json.Deserialize(NULL, NULL)); if (!root.get()) return NULL; |