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

chrome/browser/chromeos/login/chrome_restart_request.cc

Index: chrome/browser/chromeos/login/chrome_restart_request.cc
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 8bb121e84353cf46a086cf681ce86fe462286170..e2623e224814af85ccc0812c06e22297779acec0 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -97,7 +97,6 @@ std::string DeriveCommandLine(const GURL& start_url,
       ::switches::kGpuStartupDialog,
       ::switches::kHasChromeOSDiamondKey,
       ::switches::kHasChromeOSKeyboard,
-      ::switches::kLoginProfile,
       ::switches::kNaturalScrollDefault,
       ::switches::kNoSandbox,
       ::switches::kPpapiFlashArgs,
@@ -161,6 +160,7 @@ std::string DeriveCommandLine(const GURL& start_url,
       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 @@ std::string GetOffTheRecordCommandLine(
     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,