This CL fixes the issue with login using alternative e-mails.

chrome/browser/chromeos/login/test/oobe_base_test.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 21 matching lines @@
 
 class NetworkPortalDetectorTestImpl;
 
 // Base class for OOBE, login, SAML and Kiosk tests.
 class OobeBaseTest : public ExtensionApiTest {
  public:
   // Default fake user email and password, may be used by tests.
 
   static const char kFakeUserEmail[];
   static const char kFakeUserPassword[];
+  static const char kFakeUserGaiaId[];
 
   // FakeGaia is configured to return these cookies for kFakeUserEmail.
   static const char kFakeSIDCookie[];
   static const char kFakeLSIDCookie[];
 
   OobeBaseTest();
   ~OobeBaseTest() override;
 
   // Subclasses may register their own custom request handlers that will
   // process requests prior it gets handled by FakeGaia instance.
@@ skipping 55 matching lines @@
   std::string gaia_frame_parent_;
   bool initialize_fake_merge_session_;
   test::JSChecker js_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_