diff options
Diffstat (limited to 'chrome/installer/util')
-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; |