Revert 192504 "Re-apply 192420: Move login switches to src/chromeos"

trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc

Index: trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc	(revision 192508)
+++ trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc	(working copy)
@@ -97,6 +97,7 @@
       ::switches::kGpuStartupDialog,
       ::switches::kHasChromeOSDiamondKey,
       ::switches::kHasChromeOSKeyboard,
+      ::switches::kLoginProfile,
       ::switches::kNaturalScrollDefault,
       ::switches::kNoSandbox,
       ::switches::kPpapiFlashArgs,
@@ -160,7 +161,6 @@
       cc::switches::kUIEnablePartialSwap,
       cc::switches::kUIEnablePerTilePainting,
       chromeos::switches::kDbusStub,
-      chromeos::switches::kLoginProfile,
       gfx::switches::kEnableBrowserTextSubpixelPositioning,
       gfx::switches::kEnableWebkitTextSubpixelPositioning,
       views::corewm::switches::kNoDropShadows,
@@ -300,10 +300,10 @@
     const CommandLine& base_command_line,
     CommandLine* command_line) {
   base::DictionaryValue otr_switches;
-  otr_switches.SetString(switches::kGuestSession, std::string());
+  otr_switches.SetString(::switches::kGuestSession, std::string());
   otr_switches.SetString(::switches::kIncognito, std::string());
   otr_switches.SetString(::switches::kLoggingLevel, kGuestModeLoggingLevel);
-  otr_switches.SetString(switches::kLoginUser, kGuestUserName);
+  otr_switches.SetString(::switches::kLoginUser, kGuestUserName);
 
   // Override the home page.
   otr_switches.SetString(::switches::kHomePage,