Many changes to DictionaryValues:...

chrome/installer/util/google_chrome_distribution.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <atlbase.h>
 #include <windows.h>
@@ skipping 93 matching lines @@
   return base::LaunchApp(cmd_line, false, false, NULL);
 }
 
 }  // namespace
 
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
     DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
   DCHECK(NULL != metrics);
   bool has_values = false;
 
-  DictionaryValue::key_iterator iter(uninstall_metrics_dict->begin_keys());
-  for (; iter != uninstall_metrics_dict->end_keys(); ++iter) {
+  for (DictionaryValue::key_iterator iter(uninstall_metrics_dict->begin_keys());
+       iter != uninstall_metrics_dict->end_keys(); ++iter) {
     has_values = true;
     metrics->append(L"&");
     metrics->append(*iter);
     metrics->append(L"=");
 
     std::wstring value;
-    uninstall_metrics_dict->GetString(*iter, &value);
+    uninstall_metrics_dict->GetStringWithoutPathExpansion(*iter, &value);
     metrics->append(value);
   }
 
   return has_values;
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile(
     const std::wstring& file_path, std::wstring* uninstall_metrics_string) {
 
   JSONFileValueSerializer json_serializer(FilePath::FromWStringHack(file_path));
@@ skipping 359 matching lines @@
   };
   GoogleUpdateSettings::SetClient(outcome);
   if (outcome != kToastExpUninstallGroup)
     return;
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   base::LaunchApp(InstallUtil::GetChromeUninstallCmd(false),
                   false, false, NULL);
 }