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

chrome/browser/shell_integration.cc

Index: chrome/browser/shell_integration.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index ff0ec581cb258314dfb8036e6f4d6ba6dcc072c8..e5e9d6e81677e98ef728354dbc43f5cd00401dc2 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -18,6 +18,10 @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/chromeos_switches.h"
+#endif
+
 using content::BrowserThread;
 
 ShellIntegration::DefaultWebClientSetPermission
@@ -81,9 +85,10 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
   }
 
 #if defined(OS_CHROMEOS)
-  base::FilePath profile = cmd_line.GetSwitchValuePath(switches::kLoginProfile);
+  base::FilePath profile = cmd_line.GetSwitchValuePath(
+      chromeos::switches::kLoginProfile);
   if (!profile.empty())
-    new_cmd_line.AppendSwitchPath(switches::kLoginProfile, profile);
+    new_cmd_line.AppendSwitchPath(chromeos::switches::kLoginProfile, profile);
 #else
   if (!profile_path.empty() && !extension_app_id.empty())
     new_cmd_line.AppendSwitchPath(switches::kProfileDirectory,