Revert "cros: Make FakeGaia in OobeBaseTest a mixin"

This reverts commit c0c53eb2.

Reason for revert: breaks compilation when is_chrome_branded=true
OobeBaseTest::kFakeUserEmail is referenced at:
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/login/sync_consent_interactive_ui_test.cc?l=141&rcl=95ffa536956a89b861c39e6df1c8670638dd31a0

https://cs.chromium.org/chromium/src/chrome/test/BUILD.gn?l=2010&rcl=80199d3ea8218c1e8568bcc087c6d77f0ebaf94e

Original change's description:
> cros: Make FakeGaia in OobeBaseTest a mixin
>
> We may want to just use FakeGaia directly instead of introducing a
> mixin, but that can be decided later. For now let's focus on simplifying
> all of the test bases.
>
> Bug: 912704
> Change-Id: Id4a7ab8e0c23343b7e6e59c7b7d2aefc16891515
> Reviewed-on: https://chromium-review.googlesource.com/c/1366895
> Commit-Queue: Jacob Dufault <jdufault@chromium.org>
> Reviewed-by: Sergey Poromov <poromov@chromium.org>
> Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
> Reviewed-by: Alexander Alekseev <alemate@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#635236}

TBR=antrim@chromium.org,alemate@chromium.org,jdufault@chromium.org,poromov@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 912704
Change-Id: I31882d938465fb8404c90b84379e34aff7354512
Reviewed-on: https://chromium-review.googlesource.com/c/1490353Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635836}

chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

@@ -22,7 +22,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"

chrome/browser/chromeos/child_accounts/screen_time_controller_browsertest.cc

@@ -29,7 +29,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {

chrome/browser/chromeos/login/enable_debugging_browsertest.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

chrome/browser/chromeos/login/eula_browsertest.cc

@@ -12,7 +12,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"

chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -25,8 +25,6 @@
 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
 #include "chrome/browser/chromeos/login/app_launch_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/test/test_condition_waiter.h"
@@ -64,7 +62,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/test/browser_test_utils.h"
-#include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
@@ -2147,16 +2144,14 @@ class KioskEnterpriseTest : public KioskTest {
         "https://www.googleapis.com/auth/userinfo.email");
     userinfo_token_info.audience = gaia_urls->oauth2_chrome_client_id();
     userinfo_token_info.email = kTestEnterpriseServiceAccountId;
-    fake_gaia_.fake_gaia()->IssueOAuthToken(kTestRefreshToken,
-                                            userinfo_token_info);
+    fake_gaia_->IssueOAuthToken(kTestRefreshToken, userinfo_token_info);
 
     // The any-api access token for accessing the token minting endpoint.
     FakeGaia::AccessTokenInfo login_token_info;
     login_token_info.token = kTestLoginToken;
     login_token_info.scopes.insert(GaiaConstants::kAnyApiOAuth2Scope);
     login_token_info.audience = gaia_urls->oauth2_chrome_client_id();
-    fake_gaia_.fake_gaia()->IssueOAuthToken(kTestRefreshToken,
-                                            login_token_info);
+    fake_gaia_->IssueOAuthToken(kTestRefreshToken, login_token_info);
 
     // This is the access token requested by the app via the identity API.
     FakeGaia::AccessTokenInfo access_token_info;
@@ -2164,7 +2159,7 @@ class KioskEnterpriseTest : public KioskTest {
     access_token_info.scopes.insert(kTestAppScope);
     access_token_info.audience = kTestClientId;
     access_token_info.email = kTestEnterpriseServiceAccountId;
-    fake_gaia_.fake_gaia()->IssueOAuthToken(kTestLoginToken, access_token_info);
+    fake_gaia_->IssueOAuthToken(kTestLoginToken, access_token_info);
 
     DeviceOAuth2TokenService* token_service =
         DeviceOAuth2TokenServiceFactory::Get();
@@ -2190,8 +2185,6 @@ class KioskEnterpriseTest : public KioskTest {
   }
 
  private:
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
   DISALLOW_COPY_AND_ASSIGN(KioskEnterpriseTest);
 };
 

chrome/browser/chromeos/login/login_manager_test.cc

@@ -12,45 +12,64 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
+#include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager_test_api.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
+#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/account_id/account_id.h"
+#include "components/prefs/scoped_user_pref_update.h"
 #include "components/user_manager/known_user.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
+#include "google_apis/gaia/gaia_constants.h"
+#include "google_apis/gaia/gaia_switches.h"
+#include "google_apis/gaia/gaia_urls.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
 
+constexpr char kGAIAHost[] = "accounts.google.com";
+constexpr char kTestUserinfoToken1[] = "fake-userinfo-token-1";
+constexpr char kTestRefreshToken1[] = "fake-refresh-token-1";
+constexpr char kTestUserinfoToken2[] = "fake-userinfo-token-2";
+constexpr char kTestRefreshToken2[] = "fake-refresh-token-2";
+
 UserContext CreateUserContext(const AccountId& account_id) {
   UserContext user_context(user_manager::UserType::USER_TYPE_REGULAR,
                            account_id);
   user_context.SetKey(Key("password"));
-  if (account_id.GetUserEmail() == FakeGaiaMixin::kEnterpriseUser1) {
-    user_context.SetRefreshToken(FakeGaiaMixin::kTestRefreshToken1);
-  } else if (account_id.GetUserEmail() == FakeGaiaMixin::kEnterpriseUser2) {
-    user_context.SetRefreshToken(FakeGaiaMixin::kTestRefreshToken2);
+  if (account_id.GetUserEmail() == LoginManagerTest::kEnterpriseUser1) {
+    user_context.SetRefreshToken(kTestRefreshToken1);
+  } else if (account_id.GetUserEmail() == LoginManagerTest::kEnterpriseUser2) {
+    user_context.SetRefreshToken(kTestRefreshToken2);
   }
   return user_context;
 }
 
 }  // namespace
 
+constexpr char LoginManagerTest::kEnterpriseUser1[] = "user-1@example.com";
+constexpr char LoginManagerTest::kEnterpriseUser1GaiaId[] = "0000111111";
+constexpr char LoginManagerTest::kEnterpriseUser2[] = "user-2@example.com";
+constexpr char LoginManagerTest::kEnterpriseUser2GaiaId[] = "0000222222";
+
 LoginManagerTest::LoginManagerTest(bool should_launch_browser,
                                    bool should_initialize_webui)
     : should_launch_browser_(should_launch_browser),
@@ -65,10 +84,18 @@ void LoginManagerTest::SetUp() {
   base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
   embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
 
+  embedded_test_server()->RegisterRequestHandler(
+      base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_)));
+
   // Don't spin up the IO thread yet since no threads are allowed while
   // spawning sandbox host process. See crbug.com/322732.
   ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
 
+  // Start https wrapper here so that the URLs can be pointed at it in
+  // SetUpCommandLine().
+  ASSERT_TRUE(gaia_https_forwarder_.Initialize(
+      kGAIAHost, embedded_test_server()->base_url()));
+
   MixinBasedInProcessBrowserTest::SetUp();
 }
 
@@ -83,6 +110,13 @@ void LoginManagerTest::SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
 
+  const GURL gaia_url = gaia_https_forwarder_.GetURLForSSLHost(std::string());
+  command_line->AppendSwitchASCII(::switches::kGaiaUrl, gaia_url.spec());
+  command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
+  command_line->AppendSwitchASCII(::switches::kGoogleApisUrl, gaia_url.spec());
+
+  fake_gaia_.Initialize();
+
   MixinBasedInProcessBrowserTest::SetUpCommandLine(command_line);
 }
 
@@ -94,6 +128,19 @@ void LoginManagerTest::SetUpOnMainThread() {
   host_resolver()->AddRule("*", "127.0.0.1");
   embedded_test_server()->StartAcceptingConnections();
 
+  FakeGaia::AccessTokenInfo token_info;
+  token_info.scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
+  token_info.scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
+  token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
+
+  token_info.token = kTestUserinfoToken1;
+  token_info.email = kEnterpriseUser1;
+  fake_gaia_.IssueOAuthToken(kTestRefreshToken1, token_info);
+
+  token_info.token = kTestUserinfoToken2;
+  token_info.email = kEnterpriseUser2;
+  fake_gaia_.IssueOAuthToken(kTestRefreshToken2, token_info);
+
   if (should_initialize_webui_) {
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,

chrome/browser/chromeos/login/login_manager_test.h

@@ -9,6 +9,9 @@
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/mixin_based_in_process_browser_test.h"
+#include "chrome/browser/chromeos/login/test/https_forwarder.h"
+#include "chrome/browser/chromeos/login/test/js_checker.h"
+#include "google_apis/gaia/fake_gaia.h"
 
 class AccountId;
 
@@ -58,6 +61,23 @@ class LoginManagerTest : public MixinBasedInProcessBrowserTest {
   // Add user with |user_id| to session.
   void AddUser(const AccountId& user_id);
 
+  // For obviously consumer users (that have e.g. @gmail.com e-mail) policy
+  // fetching code is skipped. This code is executed only for users that may be
+  // enterprise users. Thus if you derive from this class and don't need
+  // policies, please use @gmail.com e-mail for login. But if you need policies
+  // for your test, you must use e-mail addresses that a) have a potentially
+  // enterprise domain and b) have been registered with |fake_gaia_|.
+  // For your convenience, the e-mail addresses for users that have been set up
+  // in this way are provided below.
+  static const char kEnterpriseUser1[];
+  static const char kEnterpriseUser1GaiaId[];
+  static const char kEnterpriseUser2[];
+  static const char kEnterpriseUser2GaiaId[];
+
+ protected:
+  FakeGaia fake_gaia_;
+  HTTPSForwarder gaia_https_forwarder_;
+
  private:
   const bool should_launch_browser_;
   const bool should_initialize_webui_;

chrome/browser/chromeos/login/login_ui_browsertest.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/chromeos/login/screenshot_testing/login_screen_areas.h"
 #include "chrome/browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/pref_names.h"

chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/settings/scoped_testing_cros_settings.h"

chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -67,8 +66,7 @@ void GetAccessPointRlzInBackgroundThread(rlz_lib::AccessPoint point,
 
 class LoginUtilsTest : public OobeBaseTest {
  public:
-  LoginUtilsTest() = default;
-  ~LoginUtilsTest() override = default;
+  LoginUtilsTest() {}
 
   void RunUntilIdle() { base::RunLoop().RunUntilIdle(); }
 
@@ -90,8 +88,6 @@ class LoginUtilsTest : public OobeBaseTest {
   }
 
  private:
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsTest);
 };
 

chrome/browser/chromeos/login/oobe_browsertest.cc

@@ -10,7 +10,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
@@ -35,8 +34,8 @@ namespace chromeos {
 
 class OobeTest : public OobeBaseTest {
  public:
-  OobeTest() = default;
-  ~OobeTest() override = default;
+  OobeTest() {}
+  ~OobeTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kOobeSkipPostLogin);
@@ -65,8 +64,6 @@ class OobeTest : public OobeBaseTest {
   }
 
  private:
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
   DISALLOW_COPY_AND_ASSIGN(OobeTest);
 };
 
@@ -80,9 +77,9 @@ IN_PROC_BROWSER_TEST_F(OobeTest, NewUser) {
   LoginDisplayHost::default_host()
       ->GetOobeUI()
       ->GetGaiaScreenView()
-      ->ShowSigninScreenForTest(FakeGaiaMixin::kFakeUserEmail,
-                                FakeGaiaMixin::kFakeUserPassword,
-                                FakeGaiaMixin::kEmptyUserServices);
+      ->ShowSigninScreenForTest(OobeBaseTest::kFakeUserEmail,
+                                OobeBaseTest::kFakeUserPassword,
+                                OobeBaseTest::kEmptyUserServices);
 
   session_start_waiter.Wait();
 }

chrome/browser/chromeos/login/oobe_interactive_ui_test.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/test_condition_waiter.h"
@@ -25,7 +24,6 @@
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/test/test_utils.h"
 
 namespace chromeos {
 namespace {
@@ -252,9 +250,9 @@ class OobeInteractiveUITest
     LoginDisplayHost::default_host()
         ->GetOobeUI()
         ->GetGaiaScreenView()
-        ->ShowSigninScreenForTest(FakeGaiaMixin::kFakeUserEmail,
-                                  FakeGaiaMixin::kFakeUserPassword,
-                                  FakeGaiaMixin::kEmptyUserServices);
+        ->ShowSigninScreenForTest(OobeBaseTest::kFakeUserEmail,
+                                  OobeBaseTest::kFakeUserPassword,
+                                  OobeBaseTest::kEmptyUserServices);
     LOG(INFO) << "OobeInteractiveUITest: Logged in.";
   }
 
@@ -345,7 +343,7 @@ class OobeInteractiveUITest
         "setup.hidden");
     EXPECT_TRUE(quick_unlock_private_get_auth_token_password_.has_value());
     EXPECT_EQ(quick_unlock_private_get_auth_token_password_,
-              FakeGaiaMixin::kFakeUserPassword);
+              OobeBaseTest::kFakeUserPassword);
   }
 
   void ExitDiscoverPinSetupScreen() {
@@ -373,8 +371,6 @@ class OobeInteractiveUITest
   base::Optional<Parameters> params_;
 
  private:
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
   DISALLOW_COPY_AND_ASSIGN(OobeInteractiveUITest);
 };
 

chrome/browser/chromeos/login/reset_browsertest.cc

@@ -9,7 +9,6 @@
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/chromeos/login/saml/saml_browsertest.cc

@@ -32,9 +32,7 @@
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/https_forwarder.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -329,33 +327,27 @@ void SecretInterceptingFakeCryptohomeClient::MountEx(
 class SamlTest : public OobeBaseTest {
  public:
   SamlTest() : cryptohome_client_(new SecretInterceptingFakeCryptohomeClient) {
-    fake_gaia_.set_initialize_fake_merge_session(false);
+    set_initialize_fake_merge_session(false);
   }
   ~SamlTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    OobeBaseTest::SetUpCommandLine(command_line);
-
     command_line->AppendSwitch(switches::kOobeSkipPostLogin);
     command_line->AppendSwitch(
         chromeos::switches::kAllowFailedPolicyFetchForTest);
 
-    ASSERT_TRUE(saml_https_forwarder_.Initialize(
-        kIdPHost, embedded_test_server()->base_url()));
-    const GURL gaia_url =
-        fake_gaia_.gaia_https_forwarder()->GetURLForSSLHost("");
+    const GURL gaia_url = gaia_https_forwarder_.GetURLForSSLHost("");
     const GURL saml_idp_url = saml_https_forwarder_.GetURLForSSLHost("SAML");
     fake_saml_idp_.SetUp(saml_idp_url.path(), gaia_url);
-    fake_gaia_.fake_gaia()->RegisterSamlUser(kFirstSAMLUserEmail, saml_idp_url);
-    fake_gaia_.fake_gaia()->RegisterSamlUser(kSecondSAMLUserEmail,
-                                             saml_idp_url);
-    fake_gaia_.fake_gaia()->RegisterSamlUser(
+    fake_gaia_->RegisterSamlUser(kFirstSAMLUserEmail, saml_idp_url);
+    fake_gaia_->RegisterSamlUser(kSecondSAMLUserEmail, saml_idp_url);
+    fake_gaia_->RegisterSamlUser(
         kHTTPSAMLUserEmail,
         embedded_test_server()->base_url().Resolve("/SAML"));
-    fake_gaia_.fake_gaia()->RegisterSamlUser(kDifferentDomainSAMLUserEmail,
-                                             saml_idp_url);
-    fake_gaia_.fake_gaia()->RegisterSamlDomainRedirectUrl("corp.example.com",
-                                                          saml_idp_url);
+    fake_gaia_->RegisterSamlUser(kDifferentDomainSAMLUserEmail, saml_idp_url);
+    fake_gaia_->RegisterSamlDomainRedirectUrl("corp.example.com", saml_idp_url);
+
+    OobeBaseTest::SetUpCommandLine(command_line);
   }
 
   void SetUpInProcessBrowserTestFixture() override {
@@ -366,7 +358,7 @@ class SamlTest : public OobeBaseTest {
   }
 
   void SetUpOnMainThread() override {
-    fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(
+    fake_gaia_->SetFakeMergeSessionParams(
         kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1);
 
     embedded_test_server()->RegisterRequestHandler(base::Bind(
@@ -442,12 +434,16 @@ class SamlTest : public OobeBaseTest {
   FakeSamlIdp* fake_saml_idp() { return &fake_saml_idp_; }
 
  protected:
+  void InitHttpsForwarders() override {
+    ASSERT_TRUE(saml_https_forwarder_.Initialize(
+        kIdPHost, embedded_test_server()->base_url()));
+    OobeBaseTest::InitHttpsForwarders();
+  }
+
   HTTPSForwarder saml_https_forwarder_;
 
   SecretInterceptingFakeCryptohomeClient* cryptohome_client_;
 
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
  private:
   FakeSamlIdp fake_saml_idp_;
 
@@ -700,8 +696,8 @@ IN_PROC_BROWSER_TEST_F(SamlTest, FailToRetrieveAutenticatedUserEmailAddress) {
   fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html");
   StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail);
 
-  fake_gaia_.fake_gaia()->SetFakeMergeSessionParams("", kTestAuthSIDCookie1,
-                                                    kTestAuthLSIDCookie1);
+  fake_gaia_->SetFakeMergeSessionParams("", kTestAuthSIDCookie1,
+                                        kTestAuthLSIDCookie1);
   SetSignFormField("Email", "fake_user");
   SetSignFormField("Password", "fake_password");
   ExecuteJsInSigninFrame("document.getElementById('Submit').click();");
@@ -914,7 +910,7 @@ void SAMLEnrollmentTest::SetUpOnMainThread() {
   token_info.scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
   token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
   token_info.email = kFirstSAMLUserEmail;
-  fake_gaia_.fake_gaia()->IssueOAuthToken(kTestRefreshToken, token_info);
+  fake_gaia_->IssueOAuthToken(kTestRefreshToken, token_info);
 
   SamlTest::SetUpOnMainThread();
 }
@@ -941,8 +937,7 @@ void SAMLEnrollmentTest::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
   const GURL origin = validated_url.GetOrigin();
-  if (origin !=
-          fake_gaia_.gaia_https_forwarder()->GetURLForSSLHost(std::string()) &&
+  if (origin != gaia_https_forwarder_.GetURLForSSLHost(std::string()) &&
       origin != saml_https_forwarder_.GetURLForSSLHost(std::string())) {
     return;
   }
@@ -1267,9 +1262,9 @@ void SAMLPolicyTest::LogInWithSAML(const std::string& user_id,
   fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html");
   StartSamlAndWaitForIdpPageLoad(user_id);
 
-  fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(user_id, auth_sid_cookie,
-                                                    auth_lsid_cookie);
-  fake_gaia_.SetupFakeGaiaForLogin(user_id, "", kTestRefreshToken);
+  fake_gaia_->SetFakeMergeSessionParams(user_id, auth_sid_cookie,
+                                        auth_lsid_cookie);
+  SetupFakeGaiaForLogin(user_id, "", kTestRefreshToken);
 
   SetSignFormField("Email", "fake_user");
   SetSignFormField("Password", "fake_password");
@@ -1313,10 +1308,9 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, PRE_NoSAML) {
 
   WaitForSigninScreen();
 
-  fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(
-      kNonSAMLUserEmail, FakeGaiaMixin::kFakeSIDCookie,
-      FakeGaiaMixin::kFakeLSIDCookie);
-  fake_gaia_.SetupFakeGaiaForLogin(kNonSAMLUserEmail, "", kTestRefreshToken);
+  fake_gaia_->SetFakeMergeSessionParams(kNonSAMLUserEmail, kFakeSIDCookie,
+                                        kFakeLSIDCookie);
+  SetupFakeGaiaForLogin(kNonSAMLUserEmail, "", kTestRefreshToken);
 
   // Log in without SAML.
   LoginDisplayHost::default_host()
@@ -1489,7 +1483,7 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, SAMLInterstitialChangeAccount) {
 // Disabled due to flakiness, see crbug.com/699228
 IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, DISABLED_SAMLInterstitialNext) {
   fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html");
-  fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(
+  fake_gaia_->SetFakeMergeSessionParams(
       kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1);
   SetLoginBehaviorPolicyToSAMLInterstitial();
   WaitForSigninScreen();

chrome/browser/chromeos/login/screens/user_selection_screen_browsertest.cc

@@ -10,7 +10,6 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

chrome/browser/chromeos/login/session/chrome_session_manager_browsertest.cc

@@ -14,8 +14,6 @@
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-#include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
@@ -75,9 +73,7 @@ class UserAddingScreenWaiter : public UserAddingScreen::Observer {
 
 class ChromeSessionManagerTest : public LoginManagerTest {
  public:
-  ChromeSessionManagerTest()
-      : LoginManagerTest(true, true),
-        fake_gaia_{&mixin_host_, embedded_test_server()} {}
+  ChromeSessionManagerTest() : LoginManagerTest(true, true) {}
   ~ChromeSessionManagerTest() override {}
 
   // LoginManagerTest:
@@ -95,9 +91,6 @@ class ChromeSessionManagerTest : public LoginManagerTest {
     OobeScreenWaiter(OobeScreen::SCREEN_GAIA_SIGNIN).Wait();
   }
 
- protected:
-  FakeGaiaMixin fake_gaia_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeSessionManagerTest);
 };
@@ -110,9 +103,8 @@ IN_PROC_BROWSER_TEST_F(ChromeSessionManagerTest, OobeNewUser) {
   EXPECT_EQ(0u, manager->sessions().size());
 
   // Login via fake gaia to add a new user.
-  fake_gaia_.SetupFakeGaiaForLoginManager();
-  fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(kTestUsers[0].email,
-                                                    "fake_sid", "fake_lsid");
+  fake_gaia_.SetFakeMergeSessionParams(kTestUsers[0].email, "fake_sid",
+                                       "fake_lsid");
   StartSignInScreen();
 
   content::WindowedNotificationObserver session_start_waiter(
@@ -198,9 +190,8 @@ class ChromeSessionManagerRlzTest : public ChromeSessionManagerTest {
     EXPECT_EQ(0u, manager->sessions().size());
 
     // Login via fake gaia to add a new user.
-    fake_gaia_.SetupFakeGaiaForLoginManager();
-    fake_gaia_.fake_gaia()->SetFakeMergeSessionParams(kTestUsers[0].email,
-                                                      "fake_sid", "fake_lsid");
+    fake_gaia_.SetFakeMergeSessionParams(kTestUsers[0].email, "fake_sid",
+                                         "fake_lsid");
     StartSignInScreen();
 
     content::WindowedNotificationObserver session_start_waiter(

chrome/browser/chromeos/login/signin/device_id_browsertest.cc

@@ -10,8 +10,6 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -26,7 +24,6 @@
 #include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/test/test_utils.h"
 
 namespace {
 
@@ -75,7 +72,7 @@ class DeviceIDTest : public OobeBaseTest,
   }
 
   std::string GetDeviceIdFromGAIA(const std::string& refresh_token) {
-    return fake_gaia_.fake_gaia()->GetDeviceIdByRefreshToken(refresh_token);
+    return fake_gaia_->GetDeviceIdByRefreshToken(refresh_token);
   }
 
   // Checks that user's device ID retrieved from UserManager and Profile are the
@@ -112,8 +109,8 @@ class DeviceIDTest : public OobeBaseTest,
     FakeGaia::MergeSessionParams params;
     params.email = user_id;
     params.refresh_token = refresh_token;
-    fake_gaia_.fake_gaia()->UpdateMergeSessionParams(params);
-    fake_gaia_.fake_gaia()->MapEmailToGaiaId(user_id, gaia_id);
+    fake_gaia_->UpdateMergeSessionParams(params);
+    fake_gaia_->MapEmailToGaiaId(user_id, gaia_id);
 
     LoginDisplayHost::default_host()
         ->GetOobeUI()
@@ -167,13 +164,12 @@ class DeviceIDTest : public OobeBaseTest,
       EXPECT_TRUE(it.value().GetAsString(&device_id));
       map[it.key()] = device_id;
     }
-    fake_gaia_.fake_gaia()->SetRefreshTokenToDeviceIdMap(map);
+    fake_gaia_->SetRefreshTokenToDeviceIdMap(map);
   }
 
   void SaveRefreshTokenToDeviceIdMap() {
     base::DictionaryValue dictionary;
-    for (const auto& kv :
-         fake_gaia_.fake_gaia()->refresh_token_to_device_id_map())
+    for (const auto& kv : fake_gaia_->refresh_token_to_device_id_map())
       dictionary.SetKey(kv.first, base::Value(kv.second));
     std::string json;
     EXPECT_TRUE(base::JSONWriter::Write(dictionary, &json));
@@ -183,51 +179,45 @@ class DeviceIDTest : public OobeBaseTest,
   }
 
   std::unique_ptr<base::RunLoop> user_removal_loop_;
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
 };
 
 // Add the first user and check that device ID is consistent.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_PRE_PRE_PRE_PRE_NewUsers) {
-  SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
-               kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
-  CheckDeviceIDIsConsistent(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), kRefreshToken1);
+  SignInOnline(kFakeUserEmail, kFakeUserPassword, kRefreshToken1,
+               kFakeUserGaiaId);
+  CheckDeviceIDIsConsistent(AccountId::FromUserEmail(kFakeUserEmail),
+                            kRefreshToken1);
 }
 
 // Authenticate the first user through GAIA and verify that device ID remains
 // the same.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_PRE_PRE_PRE_NewUsers) {
   const std::string device_id =
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail));
+      GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail));
   EXPECT_FALSE(device_id.empty());
   EXPECT_EQ(device_id, GetDeviceIdFromGAIA(kRefreshToken1));
 
-  SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
-               kRefreshToken2, FakeGaiaMixin::kFakeUserGaiaId);
-  CheckDeviceIDIsConsistent(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), kRefreshToken2);
+  SignInOnline(kFakeUserEmail, kFakeUserPassword, kRefreshToken2,
+               kFakeUserGaiaId);
+  CheckDeviceIDIsConsistent(AccountId::FromUserEmail(kFakeUserEmail),
+                            kRefreshToken2);
 
-  CHECK_EQ(
-      device_id,
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail)));
+  CHECK_EQ(device_id, GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail)));
 }
 
 // Authenticate the first user offline and verify that device ID remains
 // the same.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_PRE_PRE_NewUsers) {
   const std::string device_id =
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail));
+      GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail));
   EXPECT_FALSE(device_id.empty());
 
-  SignInOffline(FakeGaiaMixin::kFakeUserEmail,
-                FakeGaiaMixin::kFakeUserPassword);
-  CheckDeviceIDIsConsistent(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), kRefreshToken2);
+  SignInOffline(kFakeUserEmail, kFakeUserPassword);
+  CheckDeviceIDIsConsistent(AccountId::FromUserEmail(kFakeUserEmail),
+                            kRefreshToken2);
 
   // Verify that device ID remained the same after offline auth.
-  CHECK_EQ(
-      device_id,
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail)));
+  CHECK_EQ(device_id, GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail)));
 }
 
 // Add the second user.
@@ -259,41 +249,36 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, NewUsers) {
 
 // Set up a user that has a device ID stored in preference only.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_Migration) {
-  SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
-               kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
+  SignInOnline(kFakeUserEmail, kFakeUserPassword, kRefreshToken1,
+               kFakeUserGaiaId);
 
   // Simulate user that has device ID saved only in preferences (pre-M44).
   PrefService* prefs =
       ProfileHelper::Get()
           ->GetProfileByUser(user_manager::UserManager::Get()->GetActiveUser())
           ->GetPrefs();
-  prefs->SetString(
-      prefs::kGoogleServicesSigninScopedDeviceId,
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail)));
+  prefs->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
+                   GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail)));
 
   // Can't use SetKnownUserDeviceId here, because it forbids changing a device
   // ID.
   user_manager::known_user::SetStringPref(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), "device_id",
-      std::string());
+      AccountId::FromUserEmail(kFakeUserEmail), "device_id", std::string());
 }
 
 // Tests that after the first sign in the device ID has been moved to the Local
 // state.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, Migration) {
-  EXPECT_TRUE(
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail))
-          .empty());
-  SignInOffline(FakeGaiaMixin::kFakeUserEmail,
-                FakeGaiaMixin::kFakeUserPassword);
-  CheckDeviceIDIsConsistent(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), kRefreshToken1);
+  EXPECT_TRUE(GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail)).empty());
+  SignInOffline(kFakeUserEmail, kFakeUserPassword);
+  CheckDeviceIDIsConsistent(AccountId::FromUserEmail(kFakeUserEmail),
+                            kRefreshToken1);
 }
 
 // Set up a user that doesn't have a device ID.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_LegacyUsers) {
-  SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
-               kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
+  SignInOnline(kFakeUserEmail, kFakeUserPassword, kRefreshToken1,
+               kFakeUserGaiaId);
 
   PrefService* prefs =
       ProfileHelper::Get()
@@ -305,21 +290,17 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE_LegacyUsers) {
   // Can't use SetKnownUserDeviceId here, because it forbids changing a device
   // ID.
   user_manager::known_user::SetStringPref(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), "device_id",
-      std::string());
+      AccountId::FromUserEmail(kFakeUserEmail), "device_id", std::string());
 }
 
 // Tests that device ID has been generated after the first sign in.
 IN_PROC_BROWSER_TEST_F(DeviceIDTest, LegacyUsers) {
-  EXPECT_TRUE(
-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail))
-          .empty());
-  SignInOffline(FakeGaiaMixin::kFakeUserEmail,
-                FakeGaiaMixin::kFakeUserPassword);
+  EXPECT_TRUE(GetDeviceId(AccountId::FromUserEmail(kFakeUserEmail)).empty());
+  SignInOffline(kFakeUserEmail, kFakeUserPassword);
   // Last param |auth_code| is empty, because we don't pass a device ID to GAIA
   // in this case.
-  CheckDeviceIDIsConsistent(
-      AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail), std::string());
+  CheckDeviceIDIsConsistent(AccountId::FromUserEmail(kFakeUserEmail),
+                            std::string());
 }
 
 }  // namespace chromeos

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

@@ -22,8 +22,6 @@
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -230,8 +228,7 @@ class RequestDeferrer {
 
 class OAuth2Test : public OobeBaseTest {
  protected:
-  OAuth2Test() = default;
-  ~OAuth2Test() override = default;
+  OAuth2Test() {}
 
   // OobeBaseTest overrides.
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -260,17 +257,15 @@ class OAuth2Test : public OobeBaseTest {
     params.id_token = is_under_advanced_protection
                           ? kTestIdTokenAdvancedProtectionEnabled
                           : kTestIdTokenAdvancedProtectionDisabled;
-    fake_gaia_.fake_gaia()->SetMergeSessionParams(params);
-    fake_gaia_.SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId,
-                                     kTestRefreshToken);
+    fake_gaia_->SetMergeSessionParams(params);
+    SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId, kTestRefreshToken);
   }
 
   void SetupGaiaServerForUnexpiredAccount() {
     FakeGaia::MergeSessionParams params;
     params.email = kTestEmail;
-    fake_gaia_.fake_gaia()->SetMergeSessionParams(params);
-    fake_gaia_.SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId,
-                                     kTestRefreshToken);
+    fake_gaia_->SetMergeSessionParams(params);
+    SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId, kTestRefreshToken);
   }
 
   void SetupGaiaServerForExpiredAccount() {
@@ -278,9 +273,8 @@ class OAuth2Test : public OobeBaseTest {
     params.gaia_uber_token = kTestGaiaUberToken;
     params.session_sid_cookie = kTestSession2SIDCookie;
     params.session_lsid_cookie = kTestSession2LSIDCookie;
-    fake_gaia_.fake_gaia()->SetMergeSessionParams(params);
-    fake_gaia_.SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId,
-                                     kTestRefreshToken);
+    fake_gaia_->SetMergeSessionParams(params);
+    SetupFakeGaiaForLogin(kTestEmail, kTestGaiaId, kTestRefreshToken);
   }
 
   void LoginAsExistingUser() {
@@ -451,8 +445,6 @@ class OAuth2Test : public OobeBaseTest {
     request_deferers_[path] = request_deferer;
   }
 
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
  private:
   std::map<std::string, RequestDeferrer*> request_deferers_;
 
@@ -661,7 +653,7 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, TerminateOnBadMergeSessionAfterOnlineAuth) {
   params.auth_code = kTestAuthCode;
   params.refresh_token = kTestRefreshToken;
   params.access_token = kTestAuthLoginAccessToken;
-  fake_gaia_.fake_gaia()->SetMergeSessionParams(params);
+  fake_gaia_->SetMergeSessionParams(params);
 
   // Simulate an online sign-in.
   LoginDisplayHost::default_host()

chrome/browser/chromeos/login/test/fake_gaia_mixin.cc

-// Copyright 2018 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.
-
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-
-#include "ash/public/cpp/ash_switches.h"
-#include "base/command_line.h"
-#include "google_apis/gaia/gaia_constants.h"
-#include "google_apis/gaia/gaia_switches.h"
-#include "google_apis/gaia/gaia_urls.h"
-#include "net/test/embedded_test_server/http_response.h"
-
-namespace chromeos {
-
-namespace {
-constexpr char kGAIAHost[] = "accounts.google.com";
-constexpr char kTestAllScopeAccessToken[] = "fake-all-scope-token";
-}  // namespace
-
-// static
-const char FakeGaiaMixin::kFakeUserEmail[] = "fake-email@gmail.com";
-const char FakeGaiaMixin::kFakeUserPassword[] = "fake-password";
-const char FakeGaiaMixin::kFakeUserGaiaId[] = "fake-gaiaId";
-const char FakeGaiaMixin::kEmptyUserServices[] = "[]";
-
-const char FakeGaiaMixin::kFakeSIDCookie[] = "fake-SID-cookie";
-const char FakeGaiaMixin::kFakeLSIDCookie[] = "fake-LSID-cookie";
-
-const char FakeGaiaMixin::kEnterpriseUser1[] = "user-1@example.com";
-const char FakeGaiaMixin::kEnterpriseUser1GaiaId[] = "0000111111";
-const char FakeGaiaMixin::kEnterpriseUser2[] = "user-2@example.com";
-const char FakeGaiaMixin::kEnterpriseUser2GaiaId[] = "0000222222";
-
-const char FakeGaiaMixin::kTestUserinfoToken1[] = "fake-userinfo-token-1";
-const char FakeGaiaMixin::kTestRefreshToken1[] = "fake-refresh-token-1";
-const char FakeGaiaMixin::kTestUserinfoToken2[] = "fake-userinfo-token-2";
-const char FakeGaiaMixin::kTestRefreshToken2[] = "fake-refresh-token-2";
-
-FakeGaiaMixin::FakeGaiaMixin(InProcessBrowserTestMixinHost* host,
-                             net::EmbeddedTestServer* embedded_test_server)
-    : InProcessBrowserTestMixin(host),
-      embedded_test_server_(embedded_test_server),
-      fake_gaia_(std::make_unique<FakeGaia>()) {}
-
-FakeGaiaMixin::~FakeGaiaMixin() = default;
-
-void FakeGaiaMixin::SetupFakeGaiaForLogin(const std::string& user_email,
-                                          const std::string& gaia_id,
-                                          const std::string& refresh_token) {
-  if (!gaia_id.empty())
-    fake_gaia_->MapEmailToGaiaId(user_email, gaia_id);
-
-  FakeGaia::AccessTokenInfo token_info;
-  token_info.token = kTestAllScopeAccessToken;
-  token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
-  token_info.email = user_email;
-  token_info.any_scope = true;
-  fake_gaia_->IssueOAuthToken(refresh_token, token_info);
-}
-
-void FakeGaiaMixin::SetupFakeGaiaForLoginManager() {
-  FakeGaia::AccessTokenInfo token_info;
-  token_info.scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
-  token_info.scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
-  token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
-
-  token_info.token = kTestUserinfoToken1;
-  token_info.email = kEnterpriseUser1;
-  fake_gaia_->IssueOAuthToken(kTestRefreshToken1, token_info);
-
-  token_info.token = kTestUserinfoToken2;
-  token_info.email = kEnterpriseUser2;
-  fake_gaia_->IssueOAuthToken(kTestRefreshToken2, token_info);
-}
-
-void FakeGaiaMixin::SetUp() {
-  embedded_test_server_->RegisterDefaultHandler(base::BindRepeating(
-      &FakeGaia::HandleRequest, base::Unretained(fake_gaia_.get())));
-}
-
-void FakeGaiaMixin::SetUpCommandLine(base::CommandLine* command_line) {
-  // This needs to happen after the embedded test server is initialized, which
-  // happens after FakeGaiaMixin::SetUp() but before
-  // FakeGaiaMixin::SetUpCommandLine().
-  ASSERT_TRUE(gaia_https_forwarder_.Initialize(
-      kGAIAHost, embedded_test_server_->base_url()));
-
-  GURL gaia_url = gaia_https_forwarder_.GetURLForSSLHost(std::string());
-  command_line->AppendSwitchASCII(::switches::kGaiaUrl, gaia_url.spec());
-  command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
-  command_line->AppendSwitchASCII(::switches::kGoogleApisUrl, gaia_url.spec());
-  command_line->AppendSwitchASCII(::switches::kOAuthAccountManagerUrl,
-                                  gaia_url.spec());
-}
-
-void FakeGaiaMixin::SetUpOnMainThread() {
-  fake_gaia_->Initialize();
-  fake_gaia_->set_issue_oauth_code_cookie(true);
-
-  if (initialize_fake_merge_session()) {
-    fake_gaia_->SetFakeMergeSessionParams(kFakeUserEmail, kFakeSIDCookie,
-                                          kFakeLSIDCookie);
-  }
-}
-
-}  // namespace chromeos

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

-// Copyright 2018 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_FAKE_GAIA_MIXIN_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_FAKE_GAIA_MIXIN_H_
-
-#include <memory>
-#include <string>
-
-#include "base/macros.h"
-#include "chrome/browser/chromeos/login/mixin_based_in_process_browser_test.h"
-#include "chrome/browser/chromeos/login/test/https_forwarder.h"
-#include "google_apis/gaia/fake_gaia.h"
-
-namespace base {
-class CommandLine;
-}
-
-namespace chromeos {
-
-class FakeGaiaMixin : public InProcessBrowserTestMixin {
- public:
-  // Default fake user email and password, may be used by tests.
-  static const char kFakeUserEmail[];
-  static const char kFakeUserPassword[];
-  static const char kFakeUserGaiaId[];
-  static const char kEmptyUserServices[];
-
-  // FakeGaia is configured to return these cookies for kFakeUserEmail.
-  static const char kFakeSIDCookie[];
-  static const char kFakeLSIDCookie[];
-
-  // For obviously consumer users (that have e.g. @gmail.com e-mail) policy
-  // fetching code is skipped. This code is executed only for users that may be
-  // enterprise users. Thus if you derive from this class and don't need
-  // policies, please use @gmail.com e-mail for login. But if you need policies
-  // for your test, you must use e-mail addresses that a) have a potentially
-  // enterprise domain and b) have been registered with |fake_gaia_|.
-  // For your convenience, the e-mail addresses for users that have been set up
-  // in this way are provided below.
-  static const char kEnterpriseUser1[];
-  static const char kEnterpriseUser1GaiaId[];
-  static const char kEnterpriseUser2[];
-  static const char kEnterpriseUser2GaiaId[];
-
-  static const char kTestUserinfoToken1[];
-  static const char kTestRefreshToken1[];
-  static const char kTestUserinfoToken2[];
-  static const char kTestRefreshToken2[];
-
-  FakeGaiaMixin(InProcessBrowserTestMixinHost* host,
-                net::EmbeddedTestServer* embedded_test_server);
-  ~FakeGaiaMixin() override;
-
-  // Sets up fake gaia for the login code:
-  // - Maps |user_email| to |gaia_id|. If |gaia_id| is empty, |user_email| will
-  //   be mapped to kDefaultGaiaId in FakeGaia;
-  // - Issues a special all-scope access token associated with the test refresh
-  //   token;
-  void SetupFakeGaiaForLogin(const std::string& user_email,
-                             const std::string& gaia_id,
-                             const std::string& refresh_token);
-  void SetupFakeGaiaForLoginManager();
-
-  bool initialize_fake_merge_session() {
-    return initialize_fake_merge_session_;
-  }
-  void set_initialize_fake_merge_session(bool value) {
-    initialize_fake_merge_session_ = value;
-  }
-
-  FakeGaia* fake_gaia() { return fake_gaia_.get(); }
-  HTTPSForwarder* gaia_https_forwarder() { return &gaia_https_forwarder_; }
-
-  // InProcessBrowserTestMixin:
-  void SetUp() override;
-  void SetUpCommandLine(base::CommandLine* command_line) override;
-  void SetUpOnMainThread() override;
-
- private:
-  net::EmbeddedTestServer* embedded_test_server_;
-  HTTPSForwarder gaia_https_forwarder_;
-
-  std::unique_ptr<FakeGaia> fake_gaia_;
-  bool initialize_fake_merge_session_ = true;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeGaiaMixin);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_FAKE_GAIA_MIXIN_H_

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

@@ -16,7 +16,6 @@
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager_test_api.h"
 #include "chrome/browser/chromeos/login/test/https_forwarder.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
@@ -34,15 +33,30 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
-#include "content/public/test/test_utils.h"
 #include "google_apis/gaia/gaia_switches.h"
+#include "google_apis/gaia/gaia_urls.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 
 namespace chromeos {
 
-OobeBaseTest::OobeBaseTest() {
+namespace {
+
+constexpr char kGAIAHost[] = "accounts.google.com";
+constexpr char kTestAllScopeAccessToken[] = "fake-all-scope-token";
+
+}  // namespace
+
+// static
+const char OobeBaseTest::kFakeUserEmail[] = "fake-email@gmail.com";
+const char OobeBaseTest::kFakeUserPassword[] = "fake-password";
+const char OobeBaseTest::kFakeUserGaiaId[] = "fake-gaiaId";
+const char OobeBaseTest::kEmptyUserServices[] = "[]";
+const char OobeBaseTest::kFakeSIDCookie[] = "fake-SID-cookie";
+const char OobeBaseTest::kFakeLSIDCookie[] = "fake-LSID-cookie";
+
+OobeBaseTest::OobeBaseTest() : fake_gaia_(new FakeGaia()) {
   set_exit_when_last_browser_closes(false);
   set_chromeos_user_ = false;
 }
@@ -52,24 +66,30 @@ OobeBaseTest::~OobeBaseTest() {}
 void OobeBaseTest::RegisterAdditionalRequestHandlers() {}
 
 void OobeBaseTest::SetUp() {
-  mixin_host_.SetUp();
-
   base::FilePath test_data_dir;
   base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
   embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
 
   RegisterAdditionalRequestHandlers();
 
+  embedded_test_server()->RegisterRequestHandler(
+      base::Bind(&FakeGaia::HandleRequest, base::Unretained(fake_gaia_.get())));
 
   // Don't spin up the IO thread yet since no threads are allowed while
   // spawning sandbox host process. See crbug.com/322732.
   ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
 
+  // Start https wrapper here so that the URLs can be pointed at it in
+  // SetUpCommandLine().
+  InitHttpsForwarders();
+
+  mixin_host_.SetUp();
   extensions::ExtensionApiTest::SetUp();
 }
 
 void OobeBaseTest::SetUpCommandLine(base::CommandLine* command_line) {
   extensions::ExtensionApiTest::SetUpCommandLine(command_line);
+  mixin_host_.SetUpCommandLine(command_line);
 
   if (ShouldForceWebUiLogin())
     command_line->AppendSwitch(ash::switches::kShowWebUiLogin);
@@ -79,7 +99,15 @@ void OobeBaseTest::SetUpCommandLine(base::CommandLine* command_line) {
     command_line->AppendSwitch(::switches::kDisableBackgroundNetworking);
   command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
 
-  mixin_host_.SetUpCommandLine(command_line);
+  GURL gaia_url = gaia_https_forwarder_.GetURLForSSLHost(std::string());
+  command_line->AppendSwitchASCII(::switches::kGaiaUrl, gaia_url.spec());
+  command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
+  command_line->AppendSwitchASCII(::switches::kGoogleApisUrl, gaia_url.spec());
+  command_line->AppendSwitchASCII(::switches::kOAuthAccountManagerUrl,
+                                  gaia_url.spec());
+
+  fake_gaia_->Initialize();
+  fake_gaia_->set_issue_oauth_code_cookie(true);
 }
 
 void OobeBaseTest::SetUpDefaultCommandLine(base::CommandLine* command_line) {
@@ -98,6 +126,11 @@ void OobeBaseTest::SetUpInProcessBrowserTestFixture() {
 }
 
 void OobeBaseTest::SetUpOnMainThread() {
+  if (initialize_fake_merge_session()) {
+    fake_gaia_->SetFakeMergeSessionParams(kFakeUserEmail, kFakeSIDCookie,
+                                          kFakeLSIDCookie);
+  }
+
   // Start the accept thread as the sandbox host process has already been
   // spawned.
   host_resolver()->AddRule("*", "127.0.0.1");
@@ -141,6 +174,11 @@ void OobeBaseTest::TearDown() {
   extensions::ExtensionApiTest::TearDown();
 }
 
+void OobeBaseTest::InitHttpsForwarders() {
+  ASSERT_TRUE(gaia_https_forwarder_.Initialize(
+      kGAIAHost, embedded_test_server()->base_url()));
+}
+
 bool OobeBaseTest::ShouldForceWebUiLogin() {
   return true;
 }
@@ -264,4 +302,18 @@ void OobeBaseTest::SetSignFormField(const std::string& field_id,
   ExecuteJsInSigninFrame(js);
 }
 
+void OobeBaseTest::SetupFakeGaiaForLogin(const std::string& user_email,
+                                         const std::string& gaia_id,
+                                         const std::string& refresh_token) {
+  if (!gaia_id.empty())
+    fake_gaia_->MapEmailToGaiaId(user_email, gaia_id);
+
+  FakeGaia::AccessTokenInfo token_info;
+  token_info.token = kTestAllScopeAccessToken;
+  token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
+  token_info.email = user_email;
+  token_info.any_scope = true;
+  fake_gaia_->IssueOAuthToken(refresh_token, token_info);
+}
+
 }  // namespace chromeos

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

@@ -7,9 +7,17 @@
 
 #include <string>
 
+#include "base/callback.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/mixin_based_in_process_browser_test.h"
+#include "chrome/browser/chromeos/login/test/https_forwarder.h"
+#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/test/test_utils.h"
+#include "google_apis/gaia/fake_gaia.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace content {
 class WebUI;
@@ -23,6 +31,17 @@ class NetworkPortalDetectorTestImpl;
 // Base class for OOBE, login, SAML and Kiosk tests.
 class OobeBaseTest : public extensions::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[];
+  static const char kEmptyUserServices[];
+
+  // FakeGaia is configured to return these cookies for kFakeUserEmail.
+  static const char kFakeSIDCookie[];
+  static const char kFakeLSIDCookie[];
+
   OobeBaseTest();
   ~OobeBaseTest() override;
 
@@ -31,7 +50,7 @@ class OobeBaseTest : public extensions::ExtensionApiTest {
   virtual void RegisterAdditionalRequestHandlers();
 
  protected:
-  // extensions::ExtensionApiTest:
+  // InProcessBrowserTest:
   void SetUp() override;
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpDefaultCommandLine(base::CommandLine* command_line) override;
@@ -41,6 +60,8 @@ class OobeBaseTest : public extensions::ExtensionApiTest {
   void TearDownInProcessBrowserTestFixture() override;
   void TearDown() override;
 
+  virtual void InitHttpsForwarders();
+
   // If this returns true (default), the |ash::switches::kShowWebUiLogin|
   // command-line switch is passed to force the Web Ui Login.
   // If this returns false, the switch is omitted so the views-based login may
@@ -56,6 +77,13 @@ class OobeBaseTest : public extensions::ExtensionApiTest {
   base::Closure SimulateNetworkOnlineClosure();
   base::Closure SimulateNetworkPortalClosure();
 
+  bool initialize_fake_merge_session() {
+    return initialize_fake_merge_session_;
+  }
+  void set_initialize_fake_merge_session(bool value) {
+    initialize_fake_merge_session_ = value;
+  }
+
   // Returns chrome://oobe WebUI.
   content::WebUI* GetLoginUI();
 
@@ -69,8 +97,18 @@ class OobeBaseTest : public extensions::ExtensionApiTest {
   void SetSignFormField(const std::string& field_id,
                         const std::string& field_value);
 
+  // Sets up fake gaia for the login code:
+  // - Maps |user_email| to |gaia_id|. If |gaia_id| is empty, |user_email| will
+  //   be mapped to kDefaultGaiaId in FakeGaia;
+  // - Issues a special all-scope access token associated with the test refresh
+  //   token;
+  void SetupFakeGaiaForLogin(const std::string& user_email,
+                             const std::string& gaia_id,
+                             const std::string& refresh_token);
+
   InProcessBrowserTestMixinHost mixin_host_;
 
+  std::unique_ptr<FakeGaia> fake_gaia_;
   NetworkPortalDetectorTestImpl* network_portal_detector_ = nullptr;
 
   // Whether to use background networking. Note this is only effective when it
@@ -79,7 +117,9 @@ class OobeBaseTest : public extensions::ExtensionApiTest {
 
   std::unique_ptr<content::WindowedNotificationObserver>
       login_screen_load_observer_;
+  HTTPSForwarder gaia_https_forwarder_;
   std::string gaia_frame_parent_ = "signin-frame";
+  bool initialize_fake_merge_session_ = true;
 
   DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
 };

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

@@ -27,7 +27,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ -210,9 +209,8 @@ class UserImageManagerTest : public LoginManagerTest,
     token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
     token_info.token = kRandomTokenStrForTesting;
     token_info.email = test_account_id1_.GetUserEmail();
-    fake_gaia_.fake_gaia()->IssueOAuthToken(kRandomTokenStrForTesting,
-                                            token_info);
-    fake_gaia_.fake_gaia()->MapEmailToGaiaId(
+    fake_gaia_.IssueOAuthToken(kRandomTokenStrForTesting, token_info);
+    fake_gaia_.MapEmailToGaiaId(
         kTestUserEmail1, identity::GetTestGaiaIdForEmail(kTestUserEmail1));
   }
 
@@ -341,14 +339,12 @@ class UserImageManagerTest : public LoginManagerTest,
       kTestUserEmail2,
       identity::GetTestGaiaIdForEmail(kTestUserEmail2));
   const AccountId enterprise_account_id_ = AccountId::FromUserEmailGaiaId(
-      FakeGaiaMixin::kEnterpriseUser1,
-      identity::GetTestGaiaIdForEmail(FakeGaiaMixin::kEnterpriseUser1));
+      kEnterpriseUser1,
+      identity::GetTestGaiaIdForEmail(kEnterpriseUser1));
   const cryptohome::AccountIdentifier cryptohome_id_ =
       cryptohome::CreateAccountIdentifierFromAccountId(enterprise_account_id_);
 
  private:
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
   DISALLOW_COPY_AND_ASSIGN(UserImageManagerTest);
 };
 

chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc

@@ -23,7 +23,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -136,14 +135,17 @@ class WallpaperPolicyTest : public LoginManagerTest,
  protected:
   WallpaperPolicyTest()
       : LoginManagerTest(true, true),
+        wallpaper_change_count_(0),
         owner_key_util_(new ownership::MockOwnerKeyUtil()),
-        fake_session_manager_client_(new FakeSessionManagerClient) {
-    testUsers_.push_back(
-        AccountId::FromUserEmailGaiaId(FakeGaiaMixin::kEnterpriseUser1,
-                                       FakeGaiaMixin::kEnterpriseUser1GaiaId));
-    testUsers_.push_back(
-        AccountId::FromUserEmailGaiaId(FakeGaiaMixin::kEnterpriseUser2,
-                                       FakeGaiaMixin::kEnterpriseUser2GaiaId));
+        fake_session_manager_client_(new FakeSessionManagerClient),
+        observer_binding_(this),
+        weak_ptr_factory_(this) {
+    testUsers_.push_back(AccountId::FromUserEmailGaiaId(
+        LoginManagerTest::kEnterpriseUser1,
+        LoginManagerTest::kEnterpriseUser1GaiaId));
+    testUsers_.push_back(AccountId::FromUserEmailGaiaId(
+        LoginManagerTest::kEnterpriseUser2,
+        LoginManagerTest::kEnterpriseUser2GaiaId));
   }
 
   std::unique_ptr<policy::UserPolicyBuilder> GetUserPolicyBuilder(
@@ -329,23 +331,21 @@ class WallpaperPolicyTest : public LoginManagerTest,
 
   base::FilePath test_data_dir_;
   std::unique_ptr<base::RunLoop> run_loop_;
-  int wallpaper_change_count_ = 0;
+  int wallpaper_change_count_;
   std::unique_ptr<policy::UserPolicyBuilder> user_policy_builders_[2];
   policy::DevicePolicyBuilder device_policy_;
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
   FakeSessionManagerClient* fake_session_manager_client_;
   std::vector<AccountId> testUsers_;
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
 
  private:
   // The binding this instance uses to implement ash::mojom::WallpaperObserver.
-  mojo::AssociatedBinding<ash::mojom::WallpaperObserver> observer_binding_{
-      this};
+  mojo::AssociatedBinding<ash::mojom::WallpaperObserver> observer_binding_;
 
   // The average ARGB color of the current wallpaper.
   base::Optional<SkColor> average_color_;
 
-  base::WeakPtrFactory<WallpaperPolicyTest> weak_ptr_factory_{this};
+  base::WeakPtrFactory<WallpaperPolicyTest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperPolicyTest);
 };

chrome/browser/chromeos/login/webview_login_browsertest.cc

@@ -19,8 +19,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/signin_partition_manager.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
-#include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -166,8 +164,8 @@ void PrefChangeWatcher::OnPrefChange() {
 
 class WebviewLoginTest : public OobeBaseTest {
  public:
-  WebviewLoginTest() = default;
-  ~WebviewLoginTest() override = default;
+  WebviewLoginTest() {}
+  ~WebviewLoginTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kOobeSkipPostLogin);
@@ -236,7 +234,6 @@ class WebviewLoginTest : public OobeBaseTest {
 
  protected:
   chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
-  FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebviewLoginTest);
@@ -248,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, Basic) {
 
   ExpectIdentifierPage();
 
-  SetSignFormField("identifier", FakeGaiaMixin::kFakeUserEmail);
+  SetSignFormField("identifier", OobeBaseTest::kFakeUserEmail);
   ClickNext();
   WaitForGaiaPageBackButtonUpdate();
   ExpectPasswordPage();
@@ -258,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, Basic) {
       content::NotificationService::AllSources());
 
   SetSignFormField("services", "[]");
-  SetSignFormField("password", FakeGaiaMixin::kFakeUserPassword);
+  SetSignFormField("password", OobeBaseTest::kFakeUserPassword);
   ClickNext();
 
   session_start_waiter.Wait();
@@ -272,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, DISABLED_BackButton) {
   ExpectIdentifierPage();
 
   // Move to password page.
-  SetSignFormField("identifier", FakeGaiaMixin::kFakeUserEmail);
+  SetSignFormField("identifier", OobeBaseTest::kFakeUserEmail);
   ClickNext();
   WaitForGaiaPageBackButtonUpdate();
   ExpectPasswordPage();
@@ -293,7 +290,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, DISABLED_BackButton) {
 
   // Finish sign-up.
   SetSignFormField("services", "[]");
-  SetSignFormField("password", FakeGaiaMixin::kFakeUserPassword);
+  SetSignFormField("password", OobeBaseTest::kFakeUserPassword);
   ClickNext();
 
   session_start_waiter.Wait();
@@ -322,7 +319,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, EmailPrefill) {
   WaitForGaiaPageLoad();
   test::OobeJS().ExecuteAsync("Oobe.showSigninUI('user@example.com')");
   WaitForGaiaPageReload();
-  EXPECT_EQ(fake_gaia_.fake_gaia()->prefilled_email(), "user@example.com");
+  EXPECT_EQ(fake_gaia_->prefilled_email(), "user@example.com");
 }
 
 IN_PROC_BROWSER_TEST_F(WebviewLoginTest, StoragePartitionHandling) {

chrome/browser/chromeos/policy/login_policy_test_base.cc

@@ -41,7 +41,8 @@ LoginPolicyTestBase::LoginPolicyTestBase() {
   set_open_about_blank_on_browser_launch(false);
 }
 
-LoginPolicyTestBase::~LoginPolicyTestBase() = default;
+LoginPolicyTestBase::~LoginPolicyTestBase() {
+}
 
 void LoginPolicyTestBase::SetUp() {
   base::DictionaryValue mandatory;
@@ -60,12 +61,12 @@ void LoginPolicyTestBase::SetUpCommandLine(base::CommandLine* command_line) {
 
 void LoginPolicyTestBase::SetUpOnMainThread() {
   SetMergeSessionParams();
-  fake_gaia_.SetupFakeGaiaForLogin(GetAccount(), "", kTestRefreshToken);
+  SetupFakeGaiaForLogin(GetAccount(), "", kTestRefreshToken);
   OobeBaseTest::SetUpOnMainThread();
 
   FakeGaia::MergeSessionParams params;
   params.id_token = GetIdToken();
-  fake_gaia_.fake_gaia()->UpdateMergeSessionParams(params);
+  fake_gaia_->UpdateMergeSessionParams(params);
 }
 
 std::string LoginPolicyTestBase::GetAccount() const {
@@ -96,7 +97,7 @@ void LoginPolicyTestBase::SetMergeSessionParams() {
   params.session_sid_cookie = kTestSessionSIDCookie;
   params.session_lsid_cookie = kTestSessionLSIDCookie;
   params.email = GetAccount();
-  fake_gaia_.fake_gaia()->SetMergeSessionParams(params);
+  fake_gaia_->SetMergeSessionParams(params);
 }
 
 void LoginPolicyTestBase::SkipToLoginScreen() {

chrome/browser/chromeos/policy/login_policy_test_base.h

@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 
 namespace base {
@@ -51,8 +50,6 @@ class LoginPolicyTestBase : public chromeos::OobeBaseTest {
   static const char kAccountId[];
   static const char kEmptyServices[];
 
-  chromeos::FakeGaiaMixin fake_gaia_{&mixin_host_, embedded_test_server()};
-
  private:
   void SetUpGaiaServerWithAccessTokens();
   void SetMergeSessionParams();

chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc

@@ -48,7 +48,7 @@ const char kExternalDataPath[] = "policy/blank.html";
 class UserCloudExternalDataManagerTest : public LoginPolicyTestBase {
  protected:
   void SetUp() override {
-    fake_gaia_.set_initialize_fake_merge_session(false);
+    set_initialize_fake_merge_session(false);
 
     LoginPolicyTestBase::SetUp();
   }

chrome/test/BUILD.gn

@@ -1871,8 +1871,6 @@ test("browser_tests") {
         "../browser/chromeos/login/signin/oauth2_browsertest.cc",
         "../browser/chromeos/login/test/enrollment_helper_mixin.cc",
         "../browser/chromeos/login/test/enrollment_helper_mixin.h",
-        "../browser/chromeos/login/test/fake_gaia_mixin.cc",
-        "../browser/chromeos/login/test/fake_gaia_mixin.h",
         "../browser/chromeos/login/test/hid_controller_mixin.cc",
         "../browser/chromeos/login/test/hid_controller_mixin.h",
         "../browser/chromeos/login/test/https_forwarder.cc",