Cleanup: remove unused NewAuthStatusConsumer class

Bug: None
Change-Id: I12ba0bb13c5bb3f8426f468b7c078732918156cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544948
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Auto-Submit: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828686}

chromeos/login/auth/extended_authenticator.cc

@@ -8,12 +8,6 @@
 
 namespace chromeos {
 
-// static
-scoped_refptr<ExtendedAuthenticator> ExtendedAuthenticator::Create(
-    NewAuthStatusConsumer* consumer) {
-  return ExtendedAuthenticatorImpl::Create(consumer);
-}
-
 // static
 scoped_refptr<ExtendedAuthenticator> ExtendedAuthenticator::Create(
       AuthStatusConsumer* consumer) {

chromeos/login/auth/extended_authenticator.h

@@ -39,15 +39,6 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) ExtendedAuthenticator
   using ResultCallback = base::OnceCallback<void(const std::string& result)>;
   using ContextCallback = base::OnceCallback<void(const UserContext& context)>;
 
-  class NewAuthStatusConsumer {
-   public:
-    virtual ~NewAuthStatusConsumer() {}
-    // The current login attempt has ended in failure, with error.
-    virtual void OnAuthenticationFailure(AuthState state) = 0;
-  };
-
-  static scoped_refptr<ExtendedAuthenticator> Create(
-      NewAuthStatusConsumer* consumer);
   static scoped_refptr<ExtendedAuthenticator> Create(
       AuthStatusConsumer* consumer);
 

chromeos/login/auth/extended_authenticator_impl.cc

@@ -44,16 +44,6 @@ void RecordEndMarker(const std::string& marker) {
 
 }  // namespace
 
-// static
-scoped_refptr<ExtendedAuthenticatorImpl> ExtendedAuthenticatorImpl::Create(
-    NewAuthStatusConsumer* consumer) {
-  auto extended_authenticator =
-      base::WrapRefCounted(new ExtendedAuthenticatorImpl(consumer));
-  SystemSaltGetter::Get()->GetSystemSalt(base::BindOnce(
-      &ExtendedAuthenticatorImpl::OnSaltObtained, extended_authenticator));
-  return extended_authenticator;
-}
-
 // static
 scoped_refptr<ExtendedAuthenticatorImpl> ExtendedAuthenticatorImpl::Create(
     AuthStatusConsumer* consumer) {
@@ -64,18 +54,12 @@ scoped_refptr<ExtendedAuthenticatorImpl> ExtendedAuthenticatorImpl::Create(
   return extended_authenticator;
 }
 
-ExtendedAuthenticatorImpl::ExtendedAuthenticatorImpl(
-    NewAuthStatusConsumer* consumer)
-    : salt_obtained_(false), consumer_(consumer), old_consumer_(NULL) {
-}
-
 ExtendedAuthenticatorImpl::ExtendedAuthenticatorImpl(
     AuthStatusConsumer* consumer)
-    : salt_obtained_(false), consumer_(NULL), old_consumer_(consumer) {
-}
+    : salt_obtained_(false), consumer_(consumer) {}
 
 void ExtendedAuthenticatorImpl::SetConsumer(AuthStatusConsumer* consumer) {
-  old_consumer_ = consumer;
+  consumer_ = consumer;
 }
 
 void ExtendedAuthenticatorImpl::AuthenticateToMount(
@@ -303,10 +287,10 @@ void ExtendedAuthenticatorImpl::OnMountComplete(
         cryptohome::MountExReplyToMountHash(reply.value());
     if (success_callback)
       std::move(success_callback).Run(mount_hash);
-    if (old_consumer_) {
+    if (consumer_) {
       UserContext copy = user_context;
       copy.SetUserIDHash(mount_hash);
-      old_consumer_->OnAuthSuccess(copy);
+      consumer_->OnAuthSuccess(copy);
     }
     return;
   }
@@ -320,12 +304,9 @@ void ExtendedAuthenticatorImpl::OnMountComplete(
   if (return_code == cryptohome::MOUNT_ERROR_USER_DOES_NOT_EXIST)
     state = NO_MOUNT;
 
-  if (consumer_)
-    consumer_->OnAuthenticationFailure(state);
-
-  if (old_consumer_) {
+  if (consumer_) {
     AuthFailure failure(AuthFailure::COULD_NOT_MOUNT_CRYPTOHOME);
-    old_consumer_->OnAuthFailure(failure);
+    consumer_->OnAuthFailure(failure);
   }
 }
 
@@ -339,8 +320,8 @@ void ExtendedAuthenticatorImpl::OnOperationComplete(
   if (return_code == cryptohome::MOUNT_ERROR_NONE) {
     if (success_callback)
       std::move(success_callback).Run();
-    if (old_consumer_)
-      old_consumer_->OnAuthSuccess(user_context);
+    if (consumer_)
+      consumer_->OnAuthSuccess(user_context);
     return;
   }
 
@@ -358,12 +339,9 @@ void ExtendedAuthenticatorImpl::OnOperationComplete(
   if (return_code == cryptohome::MOUNT_ERROR_USER_DOES_NOT_EXIST)
     state = NO_MOUNT;
 
-  if (consumer_)
-    consumer_->OnAuthenticationFailure(state);
-
-  if (old_consumer_) {
+  if (consumer_) {
     AuthFailure failure(AuthFailure::UNLOCK_FAILED);
-    old_consumer_->OnAuthFailure(failure);
+    consumer_->OnAuthFailure(failure);
   }
 }
 

chromeos/login/auth/extended_authenticator_impl.h

@@ -26,8 +26,6 @@ class UserContext;
 class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) ExtendedAuthenticatorImpl
     : public ExtendedAuthenticator {
  public:
-  static scoped_refptr<ExtendedAuthenticatorImpl> Create(
-      NewAuthStatusConsumer* consumer);
   static scoped_refptr<ExtendedAuthenticatorImpl> Create(
       AuthStatusConsumer* consumer);
 
@@ -60,7 +58,6 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) ExtendedAuthenticatorImpl
                             ContextCallback callback) override;
 
  private:
-  explicit ExtendedAuthenticatorImpl(NewAuthStatusConsumer* consumer);
   explicit ExtendedAuthenticatorImpl(AuthStatusConsumer* consumer);
   ~ExtendedAuthenticatorImpl() override;
 
@@ -105,8 +102,7 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) ExtendedAuthenticatorImpl
   std::string system_salt_;
   std::vector<base::OnceClosure> system_salt_callbacks_;
 
-  NewAuthStatusConsumer* consumer_;
-  AuthStatusConsumer* old_consumer_;
+  AuthStatusConsumer* consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtendedAuthenticatorImpl);
 };

chromeos/login/auth/fake_extended_authenticator.cc

@@ -10,26 +10,15 @@
 
 namespace chromeos {
 
-FakeExtendedAuthenticator::FakeExtendedAuthenticator(
-    NewAuthStatusConsumer* consumer,
-    const UserContext& expected_user_context)
-    : consumer_(consumer),
-      old_consumer_(NULL),
-      expected_user_context_(expected_user_context) {
-}
-
 FakeExtendedAuthenticator::FakeExtendedAuthenticator(
     AuthStatusConsumer* consumer,
     const UserContext& expected_user_context)
-    : consumer_(NULL),
-      old_consumer_(consumer),
-      expected_user_context_(expected_user_context) {
-}
+    : consumer_(consumer), expected_user_context_(expected_user_context) {}
 
 FakeExtendedAuthenticator::~FakeExtendedAuthenticator() = default;
 
 void FakeExtendedAuthenticator::SetConsumer(AuthStatusConsumer* consumer) {
-  old_consumer_ = consumer;
+  consumer_ = consumer;
 }
 
 void FakeExtendedAuthenticator::AuthenticateToMount(
@@ -114,16 +103,14 @@ void FakeExtendedAuthenticator::TransformKeyIfNeeded(
 }
 
 void FakeExtendedAuthenticator::OnAuthSuccess(const UserContext& context) {
-  if (old_consumer_)
-    old_consumer_->OnAuthSuccess(context);
+  if (consumer_)
+    consumer_->OnAuthSuccess(context);
 }
 
 void FakeExtendedAuthenticator::OnAuthFailure(AuthState state,
                                               const AuthFailure& error) {
   if (consumer_)
-    consumer_->OnAuthenticationFailure(state);
-  if (old_consumer_)
-    old_consumer_->OnAuthFailure(error);
+    consumer_->OnAuthFailure(error);
 }
 
 }  // namespace chromeos

chromeos/login/auth/fake_extended_authenticator.h

@@ -17,8 +17,6 @@ class AuthFailure;
 class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) FakeExtendedAuthenticator
     : public ExtendedAuthenticator {
  public:
-  FakeExtendedAuthenticator(NewAuthStatusConsumer* consumer,
-                            const UserContext& expected_user_context);
   FakeExtendedAuthenticator(AuthStatusConsumer* consumer,
                             const UserContext& expected_user_context);
 
@@ -56,8 +54,7 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) FakeExtendedAuthenticator
   void OnAuthSuccess(const UserContext& context);
   void OnAuthFailure(AuthState state, const AuthFailure& error);
 
-  NewAuthStatusConsumer* consumer_;
-  AuthStatusConsumer* old_consumer_;
+  AuthStatusConsumer* consumer_;
 
   UserContext expected_user_context_;