Revert 246674 "Indicate which authentication flow was used in Us..."

trunk/src/chrome/browser/chromeos/login/parallel_authenticator_unittest.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/parallel_authenticator.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 128 matching lines @@
   void ExpectRetailModeLoginSuccess() {
     EXPECT_CALL(consumer_, OnRetailModeLoginSuccess(_))
         .WillOnce(Invoke(MockConsumer::OnRetailModeSuccessQuit))
         .RetiresOnSaturation();
   }
 
   void ExpectLoginSuccess(const std::string& username,
                           const std::string& password,
                           const std::string& username_hash_,
                           bool pending) {
-    EXPECT_CALL(consumer_, OnLoginSuccess(UserContext(
-        username,
-        password,
-        std::string(),
-        username_hash_,
-        true,  // using_oauth
-        UserContext::AUTH_FLOW_OFFLINE)))
+    EXPECT_CALL(consumer_, OnLoginSuccess(UserContext(username,
+                                                      password,
+                                                      std::string(),
+                                                      username_hash_,
+                                                      true /* using_oauth */)))
         .WillOnce(Invoke(MockConsumer::OnSuccessQuit))
         .RetiresOnSaturation();
   }
 
   void ExpectGuestLoginSuccess() {
     EXPECT_CALL(consumer_, OnOffTheRecordLoginSuccess())
         .WillOnce(Invoke(MockConsumer::OnGuestSuccessQuit))
         .RetiresOnSaturation();
   }
 
@@ skipping 36 matching lines @@
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
 
   MockConsumer consumer_;
   scoped_refptr<ParallelAuthenticator> auth_;
   scoped_ptr<TestAttemptState> state_;
   FakeCryptohomeClient* fake_cryptohome_client_;
 };
 
 TEST_F(ParallelAuthenticatorTest, OnLoginSuccess) {
-  EXPECT_CALL(consumer_, OnLoginSuccess(UserContext(
-      username_,
-      password_,
-      std::string(),
-      username_hash_,
-      true,  // using oauth
-      UserContext::AUTH_FLOW_OFFLINE)))
+  EXPECT_CALL(consumer_, OnLoginSuccess(UserContext(username_,
+                                                    password_,
+                                                    std::string(),
+                                                    username_hash_,
+                                                    true /* using oauth */)))
       .Times(1)
       .RetiresOnSaturation();
 
   SetAttemptState(auth_.get(), state_.release());
   auth_->OnLoginSuccess();
 }
 
 TEST_F(ParallelAuthenticatorTest, OnPasswordChangeDetected) {
   EXPECT_CALL(consumer_, OnPasswordChangeDetected())
       .Times(1)
@@ skipping 380 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
 
   auth_->AuthenticateToUnlock(UserContext(username_,
                                           std::string(),
                                           std::string()));
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace chromeos