Remove GetSwitchValue() from chrome/* where easy.

chrome/installer/util/master_preferences.cc

 // 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.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include "base/file_util.h"
+#include "base/string_util.h"

[tony, 2010/08/06 00:09:38]

Nit: sort

 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/util_constants.h"
 #include "googleurl/src/gurl.h"
 
 
 namespace {
 const wchar_t* kDistroDict = L"distribution";
 
@@ skipping 81 matching lines @@
   if (!distro->GetInteger(name, value))
     return false;
 
   return true;
 }
 
 DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) {
   DictionaryValue* prefs = NULL;
 #if defined(OS_WIN)
   if (cmd_line.HasSwitch(installer_util::switches::kInstallerData)) {
-    FilePath prefs_path(
-        cmd_line.GetSwitchValue(installer_util::switches::kInstallerData));
+    FilePath prefs_path = cmd_line.GetSwitchValuePath(
+        installer_util::switches::kInstallerData);
     prefs = installer_util::ParseDistributionPreferences(prefs_path);
   }
 
   if (!prefs)
     prefs = new DictionaryValue();
 
   if (cmd_line.HasSwitch(installer_util::switches::kChromeFrame))
     installer_util::SetDistroBooleanPreference(
         prefs, installer_util::master_preferences::kChromeFrame, true);
 
@@ skipping 76 matching lines @@
   return true;
 }
 
 bool HasExtensionsBlock(const DictionaryValue* prefs,
                         DictionaryValue** extensions) {
   return (prefs->GetDictionary(master_preferences::kExtensionsBlock,
                                extensions));
 }
 
 }  // installer_util