Added a switch to let pass-through login tests skip OAuth verification part.

BUG=chromium-os:18740
TEST=make sure pass-through auth extension is working when we start chrome with --skip-oauth-login switch.
Review URL: http://codereview.chromium.org/7575030

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

chrome/browser/chromeos/login/login_performer.cc

@@ -50,8 +50,11 @@ LoginPerformer::LoginPerformer(Delegate* delegate)
       screen_lock_requested_(false),
       initial_online_auth_pending_(false),
       auth_mode_(AUTH_MODE_INTERNAL),
-      using_oauth_(CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kWebUIGaiaLogin)),
+      using_oauth_(
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kWebUIGaiaLogin) &&
+          !CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kSkipOAuthLogin)),
       method_factory_(this) {
   DCHECK(default_performer_ == NULL)
       << "LoginPerformer should have only one instance.";

chrome/browser/chromeos/login/parallel_authenticator.cc

@@ -58,8 +58,11 @@ ParallelAuthenticator::ParallelAuthenticator(LoginStatusConsumer* consumer)
     : Authenticator(consumer),
       already_reported_success_(false),
       checked_for_localaccount_(false),
-      using_oauth_(CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kWebUIGaiaLogin)) {
+      using_oauth_(
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kWebUIGaiaLogin) &&
+          !CommandLine::ForCurrentProcess()->HasSwitch(
+                  switches::kSkipOAuthLogin)) {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // If not already owned, this is a no-op.  If it is, this loads the owner's
   // public key off of disk.

chrome/common/chrome_switches.cc

@@ -1030,8 +1030,11 @@ const char kWinHttpProxyResolver[]          = "winhttp-proxy-resolver";
 // Enable WebUI based login screens.
 const char kWebUILogin[]                    = "webui-login";
 
+// Skips OAuth part of ChromeOS login process.
+const char kSkipOAuthLogin[]                = "skip-oauth-login";
+
 // Enable WebUI login screen hosted by GAIA authentication extension.
-const char kWebUIGaiaLogin[]                    = "webui-gaia-login";
+const char kWebUIGaiaLogin[]                = "webui-gaia-login";
 
 // Enables device policy support on ChromeOS.
 const char kEnableDevicePolicy[]            = "enable-device-policy";

chrome/common/chrome_switches.h

@@ -283,6 +283,7 @@ extern const char kWinHttpProxyResolver[];
 #if defined(OS_CHROMEOS)
 extern const char kWebUILogin[];
 extern const char kWebUIGaiaLogin[];
+extern const char kSkipOAuthLogin[];
 extern const char kEnableDevicePolicy[];
 extern const char kEnableGView[];
 extern const char kEnableLoginImages[];