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

> Re-apply 192420: Move login switches to src/chromeos
> Includes fix for GOOGLE_CHROME_BUILD
> 
> BUG=192420
> TBR=ben@chromium.org, nkostylev@google.com
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/13671005

TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/13590004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192510 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 46 insertions, 8 deletions

diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index 395eb6e..928db71 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -2,7 +2,6 @@ include_rules = [
   "+apps/app_shim",  # For app shim messages.
   "+breakpad",  # For Breakpad constants.
   "+chrome/plugin",  # For checking whether we're a plugin process.
-  "+chromeos",  # For chromeos_switches.h
   "+components/autofill/common",
   "+device/bluetooth",  # For BluetoothDevicePermission
   "+device/media_transfer_protocol",  # For MediaTransferProtocolManager
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2b80448..560b81c 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1547,6 +1547,13 @@ const char kEnableStaticIPConfig[]          = "enable-static-ip-config";
 // default, which needs additional UI work.
 const char kEnableWebTrustCerts[]           = "enable-web-trust-certs";
 
+// Passed to Chrome on first boot. Not passed on restart after sign out.
+const char kFirstBoot[]                     = "first-boot";
+
+// Usually in browser tests the usual login manager bringup is skipped so that
+// tests can change how it's brought up. This flag disables that.
+const char kForceLoginManagerInTests[]      = "force-login-manager-in-tests";
+
 // If true, the Chromebook has a Chrome OS keyboard. Don't use the flag for
 // Chromeboxes.
 const char kHasChromeOSKeyboard[]           = "has-chromeos-keyboard";
@@ -1557,6 +1564,28 @@ const char kHasChromeOSDiamondKey[]         = "has-chromeos-diamond-key";
 // Path for the screensaver used in Kiosk mode
 const char kKioskModeScreensaverPath[]      = "kiosk-mode-screensaver-path";
 
+// Enables Chrome-as-a-login-manager behavior.
+const char kLoginManager[]                  = "login-manager";
+
+// Allows to override the first login screen. The value should be the name of
+// the first login screen to show (see
+// chrome/browser/chromeos/login/login_wizard_view.cc for actual names).
+// Ignored if kLoginManager is not specified. TODO(avayvod): Remove when the
+// switch is no longer needed for testing.
+const char kLoginScreen[]                   = "login-screen";
+
+// Controls the initial login screen size. Pass width,height.
+const char kLoginScreenSize[]               = "login-screen-size";
+
+// Specifies the profile to use once a chromeos user is logged in.
+const char kLoginProfile[]                  = "login-profile";
+
+// Specifies the user which is already logged in.
+const char kLoginUser[]                     = "login-user";
+
+// Specifies a password to be used to login (along with login-user).
+const char kLoginPassword[]                 = "login-password";
+
 // Enables natural scroll by default.
 const char kNaturalScrollDefault[]          = "enable-natural-scroll-default";
 
@@ -1565,6 +1594,10 @@ const char kNaturalScrollDefault[]          = "enable-natural-scroll-default";
 // out-of-memory process killer.
 const char kNoDiscardTabs[]                 = "no-discard-tabs";
 
+// Indicates that the browser is in "browse without sign-in" (Guest session)
+// mode. Should completely disable extensions, sync and bookmarks.
+const char kGuestSession[]                  = "bwsi";
+
 // Enables overriding the path for the default echo component extension.
 // Useful for testing.
 const char kEchoExtensionPath[]             = "echo-ext-path";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ceff503..8d402a7 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -411,7 +411,6 @@ extern const char kOpenAsh[];
 
 #if defined(OS_CHROMEOS)
 // Keep switches in alphabetical order.
-// See also src/chromeos/chromeos_switches.h
 extern const char kAshWebUIInit[];
 extern const char kDisableAppMode[];
 extern const char kDisableBootAnimation[];
@@ -431,11 +430,22 @@ extern const char kEnableKioskMode[];
 extern const char kEnableRequestTabletSite[];
 extern const char kEnableStaticIPConfig[];
 extern const char kEnableWebTrustCerts[];
+extern const char kFirstBoot[];
+extern const char kForceLoginManagerInTests[];
 extern const char kHasChromeOSKeyboard[];
 extern const char kHasChromeOSDiamondKey[];
 extern const char kKioskModeScreensaverPath[];
+extern const char kLoginManager[];
+// TODO(avayvod): Remove this flag when it's unnecessary for testing
+// purposes.
+extern const char kLoginScreen[];
+extern const char kLoginScreenSize[];
+extern const char kLoginProfile[];
+extern const char kLoginUser[];
+extern const char kLoginPassword[];
 extern const char kNaturalScrollDefault[];
 extern const char kNoDiscardTabs[];
+extern const char kGuestSession[];
 extern const char kEchoExtensionPath[];
 extern const char kStubCrosSettings[];
 extern const char kAuthExtensionPath[];
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 9095873..896cc7b 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -51,10 +51,6 @@
 #include "chrome/common/env_vars.h"
 #include "ipc/ipc_logging.h"
 
-#if defined(OS_CHROMEOS)
-#include "chromeos/chromeos_switches.h"
-#endif
-
 #if defined(OS_WIN)
 #include <initguid.h>
 #include "base/logging_win.h"
@@ -209,7 +205,7 @@ base::FilePath GetSessionLogFile(const CommandLine& command_line) {
   } else {
     PathService::Get(chrome::DIR_USER_DATA, &log_dir);
     base::FilePath login_profile =
-        command_line.GetSwitchValuePath(chromeos::switches::kLoginProfile);
+        command_line.GetSwitchValuePath(switches::kLoginProfile);
     log_dir = log_dir.Append(login_profile);
   }
   return log_dir.Append(GetLogFileName().BaseName());
@@ -272,7 +268,7 @@ void InitChromeLogging(const CommandLine& command_line,
     // For BWSI (Incognito) logins, we want to put the logs in the user
     // profile directory that is created for the temporary session instead
     // of in the system log directory, for privacy reasons.
-    if (command_line.HasSwitch(chromeos::switches::kGuestSession))
+    if (command_line.HasSwitch(switches::kGuestSession))
       log_path = GetSessionLogFile(command_line);
 
     // On ChromeOS we log to the symlink.  We force creation of a new