Attempt to reland http://codereview.chromium.org/4928002/...

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2010 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/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 74 matching lines @@
   } else {
     master_dictionary_.reset(new DictionaryValue());
   }
 
   DCHECK(master_dictionary_.get());
 
   // A simple map from command line switches to equivalent switches in the
   // distribution dictionary.  Currently all switches added will be set to
   // 'true'.
   static const struct CmdLineSwitchToDistributionSwitch {
-    const wchar_t* cmd_line_switch;
+    const char* cmd_line_switch;
     const char* distribution_switch;
   } translate_switches[] = {
     { installer_util::switches::kCeee,
       installer_util::master_preferences::kCeee },
     { installer_util::switches::kChrome,
       installer_util::master_preferences::kChrome },
     { installer_util::switches::kChromeFrame,
       installer_util::master_preferences::kChromeFrame },
     { installer_util::switches::kCreateAllShortcuts,
       installer_util::master_preferences::kCreateAllShortcuts },
@@ skipping 23 matching lines @@
   for (int i = 0; i < arraysize(translate_switches); ++i) {
     if (cmd_line.HasSwitch(translate_switches[i].cmd_line_switch)) {
       name.resize(arraysize(kDistroDict) - 1);
       name.append(".").append(translate_switches[i].distribution_switch);
       master_dictionary_->SetBoolean(name, true);
     }
   }
 
   // See if the log file path was specified on the command line.
   std::wstring str_value(cmd_line.GetSwitchValueNative(
-      WideToASCII(installer_util::switches::kLogFile)));
+      installer_util::switches::kLogFile));
   if (!str_value.empty()) {
     name.resize(arraysize(kDistroDict) - 1);
     name.append(".").append(installer_util::master_preferences::kLogFile);
     master_dictionary_->SetString(name, str_value);
   }
 
   // Cache a pointer to the distribution dictionary. Ignore errors if any.
   master_dictionary_->GetDictionary(kDistroDict, &distribution_);
 
   InitializeProductFlags();
@@ skipping 79 matching lines @@
 std::vector<GURL> MasterPreferences::GetFirstRunTabs() const {
   return GetNamedList(kFirstRunTabs, master_dictionary_.get());
 }
 
 bool MasterPreferences::GetExtensionsBlock(DictionaryValue** extensions) const {
   return master_dictionary_->GetDictionary(
       master_preferences::kExtensionsBlock, extensions);
 }
 
 }  // installer_util