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

chrome/installer/util/util_constants.h

Index: chrome/installer/util/util_constants.h
===================================================================
--- chrome/installer/util/util_constants.h	(revision 66087)
+++ chrome/installer/util/util_constants.h	(working copy)
@@ -51,40 +51,40 @@
 };
 
 namespace switches {
-extern const wchar_t kCeee[];
-extern const wchar_t kChrome[];
-extern const wchar_t kChromeFrame[];
-extern const wchar_t kChromeSxS[];
-extern const wchar_t kCreateAllShortcuts[];
-extern const wchar_t kDeleteProfile[];
-extern const wchar_t kDisableLogging[];
-extern const wchar_t kDoNotCreateShortcuts[];
-extern const wchar_t kDoNotLaunchChrome[];
-extern const wchar_t kDoNotRegisterForUpdateLaunch[];
-extern const wchar_t kDoNotRemoveSharedItems[];
-extern const wchar_t kEnableLogging[];
-extern const wchar_t kForceUninstall[];
+extern const char kCeee[];
+extern const char kChrome[];
+extern const char kChromeFrame[];
+extern const char kChromeSxS[];
+extern const char kCreateAllShortcuts[];
+extern const char kDeleteProfile[];
+extern const char kDisableLogging[];
+extern const char kDoNotCreateShortcuts[];
+extern const char kDoNotLaunchChrome[];
+extern const char kDoNotRegisterForUpdateLaunch[];
+extern const char kDoNotRemoveSharedItems[];
+extern const char kEnableLogging[];
+extern const char kForceUninstall[];
 extern const char kInstallArchive[];
 extern const char kInstallerData[];
-extern const wchar_t kLogFile[];
-extern const wchar_t kMakeChromeDefault[];
-extern const wchar_t kMsi[];
-extern const wchar_t kMultiInstall[];
+extern const char kLogFile[];
+extern const char kMakeChromeDefault[];
+extern const char kMsi[];
+extern const char kMultiInstall[];
 extern const char kNewSetupExe[];
 extern const char kRegisterChromeBrowser[];
 extern const char kRegisterChromeBrowserSuffix[];
-extern const wchar_t kRenameChromeExe[];
-extern const wchar_t kRemoveChromeRegistration[];
-extern const wchar_t kRunAsAdmin[];
-extern const wchar_t kSystemLevel[];
-extern const wchar_t kUninstall[];
+extern const char kRenameChromeExe[];
+extern const char kRemoveChromeRegistration[];
+extern const char kRunAsAdmin[];
+extern const char kSystemLevel[];
+extern const char kUninstall[];
 extern const char kUpdateSetupExe[];
-extern const wchar_t kVerboseLogging[];
+extern const char kVerboseLogging[];
 extern const char kShowEula[];
-extern const wchar_t kAltDesktopShortcut[];
+extern const char kAltDesktopShortcut[];
 extern const char kInactiveUserToast[];
-extern const wchar_t kSystemLevelToast[];
-extern const wchar_t kToastResultsKey[];
+extern const char kSystemLevelToast[];
+extern const char kToastResultsKey[];
 }  // namespace switches
 
 extern const wchar_t kChromeDll[];