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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f0deebc1fa6c2bb07bcd255d448bc74a923b21ef..c7821c1b3845e5200719f22b43a2d454522926dc 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -134,6 +134,7 @@
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chromeos/chromeos_switches.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
@@ -1107,9 +1108,11 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
 #if defined(OS_CHROMEOS)
     const std::string& login_profile =
-        browser_command_line.GetSwitchValueASCII(switches::kLoginProfile);
+        browser_command_line.GetSwitchValueASCII(
+            chromeos::switches::kLoginProfile);
     if (!login_profile.empty())
-      command_line->AppendSwitchASCII(switches::kLoginProfile, login_profile);
+      command_line->AppendSwitchASCII(
+          chromeos::switches::kLoginProfile, login_profile);
 #endif
 
     content::RenderProcessHost* process =
@@ -1217,9 +1220,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
                                    arraysize(kSwitchNames));
   } else if (process_type == switches::kPluginProcess) {
     static const char* const kSwitchNames[] = {
-  #if defined(OS_CHROMEOS)
-      switches::kLoginProfile,
-  #endif
+#if defined(OS_CHROMEOS)
+      chromeos::switches::kLoginProfile,
+#endif
       switches::kMemoryProfiling,
       switches::kSilentDumpOnDCHECK,
       switches::kUserDataDir,