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

trunk/src/chrome/browser/profiles/profile_manager.cc

Index: trunk/src/chrome/browser/profiles/profile_manager.cc
===================================================================
--- trunk/src/chrome/browser/profiles/profile_manager.cc	(revision 192508)
+++ trunk/src/chrome/browser/profiles/profile_manager.cc	(working copy)
@@ -68,7 +68,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
@@ -315,9 +314,8 @@
   if (logged_in_) {
     base::FilePath profile_dir;
     // If the user has logged in, pick up the new profile.
-    if (command_line.HasSwitch(chromeos::switches::kLoginProfile)) {
-      profile_dir = command_line.GetSwitchValuePath(
-          chromeos::switches::kLoginProfile);
+    if (command_line.HasSwitch(switches::kLoginProfile)) {
+      profile_dir = command_line.GetSwitchValuePath(switches::kLoginProfile);
     } else {
       // We should never be logged in with no profile dir.
       NOTREACHED();
@@ -995,7 +993,7 @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!logged_in_ &&
       (!command_line.HasSwitch(switches::kTestType) ||
-       command_line.HasSwitch(chromeos::switches::kLoginProfile))) {
+       command_line.HasSwitch(switches::kLoginProfile))) {
     go_off_the_record = true;
   }
 #endif