Tame the proliferation of UserContext constructors

chrome/browser/chromeos/login/login_utils_browsertest.cc

 // Copyright (c) 2012 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/login_utils.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 379 matching lines @@
     DeviceSettingsService::Get()->SetSessionManager(
         &device_settings_test_helper, new MockOwnerKeyUtil());
 
     EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
         .WillRepeatedly(Return());
     EXPECT_CALL(*mock_async_method_caller_, AsyncGetSanitizedUsername(_, _))
         .WillRepeatedly(Return());
 
     scoped_refptr<Authenticator> authenticator =
         LoginUtils::Get()->CreateAuthenticator(this);
+    UserContext user_context(username);
+    user_context.SetPassword("password");
+    user_context.SetUserIDHash(username);
     authenticator->CompleteLogin(ProfileHelper::GetSigninProfile(),
-                                 UserContext(username,
-                                             "password",
-                                             std::string(),
-                                             username));   // username_hash
+                                 user_context);
 
-    const bool kUsingOAuth = true;
     // Setting |kHasCookies| to false prevents ProfileAuthData::Transfer from
     // waiting for an IO task before proceeding.
     const bool kHasCookies = false;
     const bool kHasActiveSession = false;
-    LoginUtils::Get()->PrepareProfile(
-        UserContext(username,
-                    "password",
-                    std::string(),
-                    username,
-                    kUsingOAuth,
-                    UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML),
-        std::string(), kHasCookies, kHasActiveSession, this);
+    user_context.SetAuthFlow(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
+    LoginUtils::Get()->PrepareProfile(user_context,
+                                      std::string(),
+                                      kHasCookies,
+                                      kHasActiveSession,
+                                      this);
     device_settings_test_helper.Flush();
     RunUntilIdle();
 
     DeviceSettingsService::Get()->UnsetSessionManager();
   }
 
   net::TestURLFetcher* PrepareOAuthFetcher(const GURL& expected_url) {
     net::TestURLFetcher* fetcher = test_url_fetcher_factory_.GetFetcherByID(0);
     EXPECT_TRUE(fetcher);
     if (!fetcher)
@@ skipping 284 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoginUtilsBlockingLoginTestInstance,
     LoginUtilsBlockingLoginTest,
     testing::Values(0, 1, 2, 3, 4, 5));
 
 }  // namespace
 
 }  // namespace chromeos