| Index: chrome/installer/util/uninstall_metrics.cc
|
| diff --git a/chrome/installer/util/uninstall_metrics.cc b/chrome/installer/util/uninstall_metrics.cc
|
| index 94219f6886f48a295a7a803da462ae338ba2c8b3..55449533e769f20abd7daa175ca22f8061bb1c26 100644
|
| --- a/chrome/installer/util/uninstall_metrics.cc
|
| +++ b/chrome/installer/util/uninstall_metrics.cc
|
| @@ -23,7 +23,7 @@ namespace {
|
| // Returns true if at least one uninstall metric was found in
|
| // uninstall_metrics_dict, false otherwise.
|
| bool BuildUninstallMetricsString(
|
| - const DictionaryValue* uninstall_metrics_dict, string16* metrics) {
|
| + const DictionaryValue* uninstall_metrics_dict, base::string16* metrics) {
|
| DCHECK(NULL != metrics);
|
| bool has_values = false;
|
|
|
| @@ -45,7 +45,7 @@ bool BuildUninstallMetricsString(
|
| } // namespace
|
|
|
| bool ExtractUninstallMetrics(const DictionaryValue& root,
|
| - string16* uninstall_metrics_string) {
|
| + base::string16* uninstall_metrics_string) {
|
| // Make sure that the user wants us reporting metrics. If not, don't
|
| // add our uninstall metrics.
|
| bool metrics_reporting_enabled = false;
|
| @@ -71,7 +71,7 @@ bool ExtractUninstallMetrics(const DictionaryValue& root,
|
| }
|
|
|
| bool ExtractUninstallMetricsFromFile(const base::FilePath& file_path,
|
| - string16* uninstall_metrics_string) {
|
| + base::string16* uninstall_metrics_string) {
|
| JSONFileValueSerializer json_serializer(file_path);
|
|
|
| std::string json_error_string;
|
|
|