summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-20 22:31:20 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-20 22:31:20 +0000
commit4d5e4ffba71554dc4828c00b207c63f42fe315fe (patch)
tree8f05f9b9aa7c60bd58bfcff4db4724543478b89d
parent70e7a0174e5155f1e58332ae628caa6353718871 (diff)
downloadchromium_src-4d5e4ffba71554dc4828c00b207c63f42fe315fe.zip
chromium_src-4d5e4ffba71554dc4828c00b207c63f42fe315fe.tar.gz
chromium_src-4d5e4ffba71554dc4828c00b207c63f42fe315fe.tar.bz2
Fix the collection of Chrome uninstall survey results which regressed a year ago in r23631.
BUG=63904 TEST=Install Chrome, ensure metrics collection is enabled in the Privacy settings, visit a few pages, uninstall Chrome. Note that the URL in the survey page contains stats such as pageviews, install date etc. Review URL: http://codereview.chromium.org/5137007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66899 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/setup/uninstall.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index ba77cd8..4b3ddee 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -252,11 +252,13 @@ DeleteResult DeleteFilesAndFolders(const std::wstring& exe_path,
if (got_local_state) {
FilePath user_local_file(
user_local_state.Append(chrome::kLocalStateFilename));
- FilePath path = FilePath::FromWStringHack(*local_state_path);
- if (!file_util::CreateTemporaryFile(&path))
+ FilePath path;
+ if (!file_util::CreateTemporaryFile(&path)) {
LOG(ERROR) << "Failed to create temporary file for Local State.";
- else
+ } else {
+ *local_state_path = path.value();
file_util::CopyFile(user_local_file, path);
+ }
} else {
LOG(ERROR) << "Could not retrieve user's profile directory.";
}