summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/uninstall_metrics.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 21:43:38 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 21:43:38 +0000
commite53a7f29591f8b3f03f97541b3b30422780b39a6 (patch)
tree5f1bb507eafc55db061d12ed78072d7a69d2f054 /chrome/installer/util/uninstall_metrics.cc
parent56cbcb3a456ffc4a2fe2f69c0d3cbd993fc0e13a (diff)
downloadchromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.zip
chromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.tar.gz
chromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.tar.bz2
Update some uses of Value in chrome/ to use the base:: namespace.
BUG=88666 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/119583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/uninstall_metrics.cc')
-rw-r--r--chrome/installer/util/uninstall_metrics.cc19
1 files changed, 11 insertions, 8 deletions
diff --git a/chrome/installer/util/uninstall_metrics.cc b/chrome/installer/util/uninstall_metrics.cc
index 5544953..58badf6 100644
--- a/chrome/installer/util/uninstall_metrics.cc
+++ b/chrome/installer/util/uninstall_metrics.cc
@@ -23,11 +23,13 @@ namespace {
// Returns true if at least one uninstall metric was found in
// uninstall_metrics_dict, false otherwise.
bool BuildUninstallMetricsString(
- const DictionaryValue* uninstall_metrics_dict, base::string16* metrics) {
+ const base::DictionaryValue* uninstall_metrics_dict,
+ base::string16* metrics) {
DCHECK(NULL != metrics);
bool has_values = false;
- for (DictionaryValue::Iterator iter(*uninstall_metrics_dict); !iter.IsAtEnd();
+ for (base::DictionaryValue::Iterator iter(*uninstall_metrics_dict);
+ !iter.IsAtEnd();
iter.Advance()) {
has_values = true;
metrics->append(L"&");
@@ -44,7 +46,7 @@ bool BuildUninstallMetricsString(
} // namespace
-bool ExtractUninstallMetrics(const DictionaryValue& root,
+bool ExtractUninstallMetrics(const base::DictionaryValue& root,
base::string16* uninstall_metrics_string) {
// Make sure that the user wants us reporting metrics. If not, don't
// add our uninstall metrics.
@@ -55,7 +57,7 @@ bool ExtractUninstallMetrics(const DictionaryValue& root,
return false;
}
- const DictionaryValue* uninstall_metrics_dict = NULL;
+ const base::DictionaryValue* uninstall_metrics_dict = NULL;
if (!root.HasKey(installer::kUninstallMetricsName) ||
!root.GetDictionary(installer::kUninstallMetricsName,
&uninstall_metrics_dict)) {
@@ -75,16 +77,17 @@ bool ExtractUninstallMetricsFromFile(const base::FilePath& file_path,
JSONFileValueSerializer json_serializer(file_path);
std::string json_error_string;
- scoped_ptr<Value> root(json_serializer.Deserialize(NULL, NULL));
+ scoped_ptr<base::Value> root(json_serializer.Deserialize(NULL, NULL));
if (!root.get())
return false;
// Preferences should always have a dictionary root.
- if (!root->IsType(Value::TYPE_DICTIONARY))
+ if (!root->IsType(base::Value::TYPE_DICTIONARY))
return false;
- return ExtractUninstallMetrics(*static_cast<DictionaryValue*>(root.get()),
- uninstall_metrics_string);
+ return ExtractUninstallMetrics(
+ *static_cast<base::DictionaryValue*>(root.get()),
+ uninstall_metrics_string);
}
} // namespace installer