Add a Key class

chrome/browser/chromeos/login/auth/mock_authenticator.h

Index: chrome/browser/chromeos/login/auth/mock_authenticator.h
diff --git a/chrome/browser/chromeos/login/auth/mock_authenticator.h b/chrome/browser/chromeos/login/auth/mock_authenticator.h
index 18d8fb9170c4cdf020b35dcc35ac5c85943570a6..57a568698e39e6cb53ae46c3aac9a6db29626d8f 100644
--- a/chrome/browser/chromeos/login/auth/mock_authenticator.h
+++ b/chrome/browser/chromeos/login/auth/mock_authenticator.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "chrome/browser/chromeos/login/auth/authenticator.h"
+#include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class Profile;
@@ -19,49 +20,35 @@ class LoginStatusConsumer;
 class MockAuthenticator : public Authenticator {
  public:
   MockAuthenticator(LoginStatusConsumer* consumer,
-                    const std::string& expected_username,
-                    const std::string& expected_password)
-      : Authenticator(consumer),
-        expected_username_(expected_username),
-        expected_password_(expected_password) {
-  }
+                    const UserContext& expected_user_context);
 
+  // Authenticator:
   virtual void CompleteLogin(Profile* profile,
                              const UserContext& user_context) OVERRIDE;
-
   virtual void AuthenticateToLogin(Profile* profile,
                                    const UserContext& user_context) OVERRIDE;
-
   virtual void AuthenticateToUnlock(const UserContext& user_context) OVERRIDE;
-
   virtual void LoginAsLocallyManagedUser(
       const UserContext& user_context) OVERRIDE;
   virtual void LoginRetailMode() OVERRIDE;
+  virtual void LoginOffTheRecord() OVERRIDE;
   virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
   virtual void LoginAsKioskAccount(const std::string& app_user_id,
                                    bool use_guest_mount) OVERRIDE;
-  virtual void LoginOffTheRecord() OVERRIDE;
-
   virtual void OnRetailModeLoginSuccess() OVERRIDE;
-
   virtual void OnLoginSuccess() OVERRIDE;
-
   virtual void OnLoginFailure(const LoginFailure& failure) OVERRIDE;
-
   virtual void RecoverEncryptedData(
-      const std::string& old_password) OVERRIDE {}
-
-  virtual void ResyncEncryptedData() OVERRIDE {}
+      const std::string& old_password) OVERRIDE;
+  virtual void ResyncEncryptedData() OVERRIDE;
 
-  virtual void SetExpectedCredentials(const std::string& expected_username,
-                                      const std::string& expected_password);
+  virtual void SetExpectedCredentials(const UserContext& user_context);
 
  protected:
-  virtual ~MockAuthenticator() {}
+  virtual ~MockAuthenticator();
 
  private:
-  std::string expected_username_;
-  std::string expected_password_;
+  UserContext expected_user_context_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAuthenticator);
 };