scanner: Remove unused command delegate from session

This is now unused as of https://crrev.com/c/6174827.

Bug: b:390305029
Change-Id: I6a6a21003ae16a4f578b2d2d20099fd1ac869347
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6182423
Commit-Queue: Michael Cui <[email protected]>
Reviewed-by: Jon Htin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1408509}

Author: mlcui-corp

ash/scanner/scanner_controller.cc

@@ -282,16 +282,8 @@ ScannerSession* ScannerController::StartNewSession() {
   // (to avoid subtle issues from having simultaneously existing sessions).
   scanner_session_ = nullptr;
   if (CanStartSession()) {
-    ScannerProfileScopedDelegate* profile_scoped_delegate =
-        delegate_->GetProfileScopedDelegate();
-    // Keep the existing `command_delegate_` if there is one, to allow commands
-    // from previous sessions to continue in the background if needed.
-    if (command_delegate_ == nullptr) {
-      command_delegate_ =
-          std::make_unique<ScannerCommandDelegateImpl>(profile_scoped_delegate);
-    }
-    scanner_session_ = std::make_unique<ScannerSession>(
-        profile_scoped_delegate, command_delegate_.get());
+    scanner_session_ =
+        std::make_unique<ScannerSession>(delegate_->GetProfileScopedDelegate());
   }
   return scanner_session_.get();
 }
@@ -315,11 +307,12 @@ void ScannerController::ExecuteAction(
   if (!scanner_session_) {
     return;
   }
-  // During an active user session, the first successful `StartNewSession()`
-  // call will create both the session and the command delegate. The command
-  // delegate is never reset afterwards, so the command delegate should always
-  // exist here.
-  CHECK(command_delegate_);
+  // Keep the existing `command_delegate_` if there is one, to allow commands
+  // from previous sessions to continue in the background if needed.
+  if (!command_delegate_) {
+    command_delegate_ = std::make_unique<ScannerCommandDelegateImpl>(
+        delegate_->GetProfileScopedDelegate());
+  }
   const manta::proto::ScannerAction::ActionCase action_case =
       scanner_action.GetActionCase();
   scanner_session_->PopulateAction(

ash/scanner/scanner_session.cc

@@ -13,7 +13,6 @@
 
 #include "ash/public/cpp/scanner/scanner_profile_scoped_delegate.h"
 #include "ash/scanner/scanner_action_view_model.h"
-#include "ash/scanner/scanner_command_delegate.h"
 #include "ash/scanner/scanner_metrics.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
@@ -168,9 +167,8 @@ void RecordAllDetectedActions(const manta::proto::ScannerOutput& output) {
 
 }  // namespace
 
-ScannerSession::ScannerSession(ScannerProfileScopedDelegate* delegate,
-                               ScannerCommandDelegate* command_delegate)
-    : delegate_(delegate), command_delegate_(command_delegate) {}
+ScannerSession::ScannerSession(ScannerProfileScopedDelegate* delegate)
+    : delegate_(delegate) {}
 
 ScannerSession::~ScannerSession() = default;
 

ash/scanner/scanner_session.h

@@ -21,7 +21,6 @@
 
 namespace ash {
 
-class ScannerCommandDelegate;
 class ScannerProfileScopedDelegate;
 
 // A ScannerSession represents a single "use" of the Scanner feature. A session
@@ -38,8 +37,7 @@ class ASH_EXPORT ScannerSession {
   using PopulateActionCallback =
       base::OnceCallback<void(manta::proto::ScannerAction action)>;
 
-  ScannerSession(ScannerProfileScopedDelegate* delegate,
-                 ScannerCommandDelegate* command_delegate);
+  explicit ScannerSession(ScannerProfileScopedDelegate* delegate);
   ScannerSession(const ScannerSession&) = delete;
   ScannerSession& operator=(const ScannerSession&) = delete;
   ~ScannerSession();
@@ -66,10 +64,6 @@ class ASH_EXPORT ScannerSession {
 
   const raw_ptr<ScannerProfileScopedDelegate> delegate_;
 
-  // Delegate for performing relevant commands after an action is fetched.
-  // Should outlive `this`.
-  const raw_ptr<ScannerCommandDelegate> command_delegate_;
-
   base::WeakPtrFactory<ScannerSession> weak_ptr_factory_{this};
 };
 

ash/scanner/scanner_session_unittest.cc

@@ -11,7 +11,6 @@
 
 #include "ash/scanner/fake_scanner_profile_scoped_delegate.h"
 #include "ash/scanner/scanner_action_view_model.h"
-#include "ash/scanner/scanner_command_delegate_impl.h"
 #include "ash/scanner/scanner_metrics.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_refptr.h"
@@ -59,8 +58,7 @@ TEST(ScannerSessionTest, FetchActionsForImageReturnsEmptyWhenDelegateErrors) {
       .WillOnce(RunOnceCallback<1>(
           nullptr, manta::MantaStatus{
                        .status_code = manta::MantaStatusCode::kInvalidInput}));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   base::test::TestFuture<std::vector<ScannerActionViewModel>> future;
   session.FetchActionsForImage(nullptr, future.GetCallback());
@@ -75,8 +73,7 @@ TEST(ScannerSessionTest,
       .WillOnce(RunOnceCallback<1>(
           std::make_unique<manta::proto::ScannerOutput>(),
           manta::MantaStatus{.status_code = manta::MantaStatusCode::kOk}));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   base::test::TestFuture<std::vector<ScannerActionViewModel>> future;
   session.FetchActionsForImage(nullptr, future.GetCallback());
@@ -99,8 +96,7 @@ TEST(ScannerSessionTest, FetchActionsForImageRecordsNumberOfActionsMetrics) {
       .WillOnce(RunOnceCallback<1>(
           std::move(output),
           manta::MantaStatus{.status_code = manta::MantaStatusCode::kOk}));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
   session.FetchActionsForImage(nullptr, base::DoNothing());
 
   histogram_tester.ExpectBucketCount(
@@ -128,8 +124,7 @@ TEST(ScannerSessionTest, FetchActionsForImageNoActionRecordsMetrics) {
       .WillOnce(RunOnceCallback<1>(
           std::move(output),
           manta::MantaStatus{.status_code = manta::MantaStatusCode::kOk}));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
   session.FetchActionsForImage(nullptr, base::DoNothing());
 
   histogram_tester.ExpectBucketCount(
@@ -144,9 +139,7 @@ TEST(ScannerSessionTest, FetchActionsForImageRecordsTimerMetric) {
   FetchActionsForImageFuture future;
   FakeScannerProfileScopedDelegate delegate;
   EXPECT_CALL(delegate, FetchActionsForImage).WillOnce(InvokeFuture(future));
-
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
   session.FetchActionsForImage(nullptr, base::DoNothing());
   task_environment.FastForwardBy(base::Milliseconds(500));
   auto output = std::make_unique<manta::proto::ScannerOutput>();
@@ -172,8 +165,7 @@ TEST(ScannerSessionTest,
       .WillOnce(RunOnceCallback<1>(
           std::move(output),
           manta::MantaStatus{.status_code = manta::MantaStatusCode::kOk}));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   base::test::TestFuture<std::vector<ScannerActionViewModel>> future;
   session.FetchActionsForImage(nullptr, future.GetCallback());
@@ -185,8 +177,7 @@ TEST(ScannerSessionTest, ResizesImageHeightToMaxEdge) {
   FakeScannerProfileScopedDelegate delegate;
   FetchActionsForImageFuture future;
   EXPECT_CALL(delegate, FetchActionsForImage).WillOnce(InvokeFuture(future));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   scoped_refptr<base::RefCountedMemory> bytes =
       MakeJpegBytes(/*width=*/2300, /*height=*/23000);
@@ -204,8 +195,7 @@ TEST(ScannerSessionTest, ResizesImageWidthToMaxEdge) {
   FakeScannerProfileScopedDelegate delegate;
   FetchActionsForImageFuture future;
   EXPECT_CALL(delegate, FetchActionsForImage).WillOnce(InvokeFuture(future));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   scoped_refptr<base::RefCountedMemory> bytes =
       MakeJpegBytes(/*width=*/23000, /*height=*/2300);
@@ -223,8 +213,7 @@ TEST(ScannerSessionTest, NoResizeIfWithinLimit) {
   FakeScannerProfileScopedDelegate delegate;
   FetchActionsForImageFuture future;
   EXPECT_CALL(delegate, FetchActionsForImage).WillOnce(InvokeFuture(future));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   scoped_refptr<base::RefCountedMemory> bytes =
       MakeJpegBytes(/*width=*/1000, /*height=*/1000);
@@ -239,8 +228,7 @@ TEST(ScannerSessionTest, DoesNotResizeIfTotalPixelSizeLowerThanMax) {
   FakeScannerProfileScopedDelegate delegate;
   FetchActionsForImageFuture future;
   EXPECT_CALL(delegate, FetchActionsForImage).WillOnce(InvokeFuture(future));
-  ScannerCommandDelegateImpl command_delegate(&delegate);
-  ScannerSession session(&delegate, &command_delegate);
+  ScannerSession session(&delegate);
 
   scoped_refptr<base::RefCountedMemory> bytes =
       MakeJpegBytes(/*width=*/4600, /*height=*/1100);