WebOTP: Mojo cleanup for SmsReceiver

This change removes the mojo `message` parameter[1] from SmsReceiver
Receive because it is no longer used since the API shape change to be
a part of credential manager.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2098499/7/third_party/blink/public/mojom/sms/sms_receiver.mojom

Bug: 1045526
Change-Id: I1c49a71ca8c07fab2dd7008d0e755cc4f7d7de4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098499Reviewed-by: Victor Costan <pwnall@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750476}

chrome/browser/sharing/sms/sms_fetch_request_handler.cc

@@ -47,10 +47,8 @@ SmsFetchRequestHandler::Request::~Request() {
 }
 
 void SmsFetchRequestHandler::Request::OnReceive(
-    const std::string& one_time_code,
-    const std::string& sms) {
+    const std::string& one_time_code) {
   auto response = std::make_unique<chrome_browser_sharing::ResponseMessage>();
-  response->mutable_sms_fetch_response()->set_sms(sms);
   response->mutable_sms_fetch_response()->set_one_time_code(one_time_code);
 
   std::move(respond_callback_).Run(std::move(response));

chrome/browser/sharing/sms/sms_fetch_request_handler.h

@@ -42,8 +42,7 @@ class SmsFetchRequestHandler : public SharingMessageHandler {
             SharingMessageHandler::DoneCallback respond_callback);
     ~Request() override;
 
-    void OnReceive(const std::string& one_time_code,
-                   const std::string& sms) override;
+    void OnReceive(const std::string& one_time_code) override;
 
    private:
     SmsFetchRequestHandler* handler_;

chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc

@@ -66,12 +66,10 @@ TEST(SmsFetchRequestHandlerTest, Basic) {
       BindLambdaForTesting([&loop](std::unique_ptr<ResponseMessage> response) {
         EXPECT_TRUE(response->has_sms_fetch_response());
         EXPECT_EQ("123", response->sms_fetch_response().one_time_code());
-        EXPECT_EQ("hello", response->sms_fetch_response().sms());
         loop.Quit();
       }));
 
-  subscriber->OnReceive("123", "hello");
-
+  subscriber->OnReceive("123");
   loop.Run();
 }
 
@@ -91,7 +89,7 @@ TEST(SmsFetchRequestHandlerTest, OutOfOrder) {
       message,
       BindLambdaForTesting([&loop1](std::unique_ptr<ResponseMessage> response) {
         EXPECT_TRUE(response->has_sms_fetch_response());
-        EXPECT_EQ("first", response->sms_fetch_response().sms());
+        EXPECT_EQ("1", response->sms_fetch_response().one_time_code());
         loop1.Quit();
       }));
 
@@ -104,16 +102,14 @@ TEST(SmsFetchRequestHandlerTest, OutOfOrder) {
       message,
       BindLambdaForTesting([&loop2](std::unique_ptr<ResponseMessage> response) {
         EXPECT_TRUE(response->has_sms_fetch_response());
-        EXPECT_EQ("second", response->sms_fetch_response().sms());
+        EXPECT_EQ("2", response->sms_fetch_response().one_time_code());
         loop2.Quit();
       }));
 
-  request2->OnReceive("2", "second");
-
+  request2->OnReceive("2");
   loop2.Run();
 
-  request1->OnReceive("1", "first");
-
+  request1->OnReceive("1");
   loop1.Run();
 }
 

chrome/browser/sharing/sms/sms_remote_fetcher.cc

@@ -63,7 +63,8 @@ void FetchRemoteSms(
             DCHECK(response);
             DCHECK(response->has_sms_fetch_response());
 
-            std::move(callback).Run(response->sms_fetch_response().sms());
+            std::move(callback).Run(
+                response->sms_fetch_response().one_time_code());
           },
           std::move(callback)));
 }

chrome/browser/sharing/sms/sms_remote_fetcher_unittest.cc

@@ -108,7 +108,7 @@ TEST(SmsRemoteFetcherTest, OneDevice) {
                            chrome_browser_sharing::SharingMessage message,
                            SharingMessageSender::ResponseCallback callback) {
         auto response = std::make_unique<ResponseMessage>();
-        response->mutable_sms_fetch_response()->set_sms("hello");
+        response->mutable_sms_fetch_response()->set_one_time_code("ABC");
         std::move(callback).Run(SharingSendMessageResult::kSuccessful,
                                 std::move(response));
       }));
@@ -117,7 +117,7 @@ TEST(SmsRemoteFetcherTest, OneDevice) {
       &profile, GetOriginForURL("a.com"),
       BindLambdaForTesting([&loop](base::Optional<std::string> result) {
         ASSERT_TRUE(result);
-        ASSERT_EQ("hello", result);
+        ASSERT_EQ("ABC", result);
         loop.Quit();
       }));
 

chrome/browser/ui/autofill/sms_client_impl.cc

@@ -22,8 +22,7 @@ void SmsClientImpl::Subscribe() {
   fetcher_->Subscribe(origin_, this);
 }
 
-void SmsClientImpl::OnReceive(const std::string& one_time_code,
-                              const std::string& sms) {
+void SmsClientImpl::OnReceive(const std::string& one_time_code) {
   one_time_code_ = one_time_code;
 }
 

chrome/browser/ui/autofill/sms_client_impl.h

@@ -31,8 +31,7 @@ class SmsClientImpl : public SmsClient, public content::SmsFetcher::Subscriber {
   const std::string& GetOTP() const override;
 
   // content::SmsFetcher::Subscriber
-  void OnReceive(const std::string& one_time_code,
-                 const std::string& sms) override;
+  void OnReceive(const std::string& one_time_code) override;
 
   content::SmsFetcher* GetFetcherForTesting();
 

chrome/browser/ui/autofill/sms_client_impl_unittest.cc

@@ -45,8 +45,7 @@ TEST_F(SmsClientImplTest, SaveOtpOnReceive) {
   sms_client()->Subscribe();
 
   std::string otp = "123";
-  std::string sms = "For: https://www.google.com?otp=" + otp;
-  sms_client()->OnReceive(otp, sms);
+  sms_client()->OnReceive(otp);
 
   EXPECT_EQ(sms_client()->GetOTP(), otp);
 }

content/browser/sms/sms_browsertest.cc

@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, Receive) {
   )";
 
   EXPECT_CALL(*mock_provider_ptr, Retrieve()).WillOnce(Invoke([&]() {
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello");
     ConfirmPrompt();
   }));
 
@@ -204,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, AtMostOneSmsRequestPerOrigin) {
   EXPECT_CALL(*mock_provider_ptr, Retrieve())
       .WillOnce(Return())
       .WillOnce(Invoke([&]() {
-        mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello", "");
+        mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello");
         ConfirmPrompt();
       }));
 
@@ -284,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest,
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
 
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello1", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello1");
     ConfirmPrompt();
 
     ukm_loop.Run();
@@ -308,7 +308,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest,
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
 
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello2", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello2");
     ConfirmPrompt();
 
     ukm_loop.Run();
@@ -440,7 +440,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsSameOrigin) {
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
 
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello1", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello1");
     ConfirmPrompt();
 
     ukm_loop.Run();
@@ -464,7 +464,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsSameOrigin) {
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
 
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello2", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello2");
     ConfirmPrompt();
 
     ukm_loop.Run();
@@ -522,7 +522,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsDifferentOrigin) {
     // capture and evaluation.
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url1), "hello1", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url1), "hello1");
     ConfirmPrompt();
     ukm_loop.Run();
   }
@@ -538,7 +538,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsDifferentOrigin) {
     // capture and evaluation.
     ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName,
                                           ukm_loop.QuitClosure());
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url2), "hello2", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url2), "hello2");
     ConfirmPrompt();
     ukm_loop.Run();
   }
@@ -574,7 +574,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, SmsReceivedAfterTabIsClosed) {
 
   shell()->Close();
 
-  mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello", "");
+  mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello");
 
   ExpectNoOutcomeUKM();
 }
@@ -595,7 +595,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, Cancels) {
   ExpectSmsPrompt();
 
   EXPECT_CALL(*mock_provider_ptr, Retrieve()).WillOnce(Invoke([&]() {
-    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello", "");
+    mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello");
     DismissPrompt();
   }));
 
@@ -634,7 +634,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, AbortAfterSmsRetrieval) {
 
   EXPECT_CALL(*mock_provider_ptr, Retrieve())
       .WillOnce(Invoke([&mock_provider_ptr, &url]() {
-        mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello", "");
+        mock_provider_ptr->NotifyReceive(url::Origin::Create(url), "hello");
       }));
 
   EXPECT_TRUE(ExecJs(shell(), R"(

content/browser/sms/sms_fetcher_impl.cc

@@ -66,15 +66,14 @@ void SmsFetcherImpl::Unsubscribe(const url::Origin& origin,
 }
 
 bool SmsFetcherImpl::Notify(const url::Origin& origin,
-                            const std::string& one_time_code,
-                            const std::string& sms) {
+                            const std::string& one_time_code) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   auto* subscriber = subscribers_.Pop(origin);
 
   if (!subscriber)
     return false;
 
-  subscriber->OnReceive(one_time_code, sms);
+  subscriber->OnReceive(one_time_code);
 
   return true;
 }
@@ -89,14 +88,13 @@ void SmsFetcherImpl::OnRemote(base::Optional<std::string> sms) {
   if (!result)
     return;
 
-  Notify(result->origin, result->one_time_code, *sms);
+  Notify(result->origin, result->one_time_code);
 }
 
 bool SmsFetcherImpl::OnReceive(const url::Origin& origin,
-                               const std::string& one_time_code,
-                               const std::string& sms) {
+                               const std::string& one_time_code) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return Notify(origin, one_time_code, sms);
+  return Notify(origin, one_time_code);
 }
 
 bool SmsFetcherImpl::HasSubscribers() {

content/browser/sms/sms_fetcher_impl.h

@@ -40,8 +40,7 @@ class CONTENT_EXPORT SmsFetcherImpl : public content::SmsFetcher,
 
   // content::SmsProvider::Observer:
   bool OnReceive(const url::Origin& origin,
-                 const std::string& one_time_code,
-                 const std::string& sms) override;
+                 const std::string& one_time_code) override;
 
   bool HasSubscribers() override;
 
@@ -50,9 +49,7 @@ class CONTENT_EXPORT SmsFetcherImpl : public content::SmsFetcher,
  private:
   void OnRemote(base::Optional<std::string> sms);
 
-  bool Notify(const url::Origin& origin,
-              const std::string& one_time_code,
-              const std::string& sms);
+  bool Notify(const url::Origin& origin, const std::string& one_time_code);
 
   // |context_| is safe because all instances of SmsFetcherImpl are owned by
   // the BrowserContext itself.

content/browser/sms/sms_fetcher_impl_unittest.cc

@@ -41,8 +41,7 @@ class MockSubscriber : public SmsFetcher::Subscriber {
   MockSubscriber() = default;
   ~MockSubscriber() override = default;
 
-  MOCK_METHOD2(OnReceive,
-               void(const std::string& one_time_code, const std::string& sms));
+  MOCK_METHOD1(OnReceive, void(const std::string& one_time_code));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSubscriber);
@@ -84,10 +83,10 @@ TEST_F(SmsFetcherImplTest, ReceiveFromLocalSmsProvider) {
   SmsFetcherImpl fetcher(nullptr, base::WrapUnique(provider()));
 
   EXPECT_CALL(*provider(), Retrieve()).WillOnce(Invoke([&]() {
-    provider()->NotifyReceive(kOrigin, "123", "hello");
+    provider()->NotifyReceive(kOrigin, "123");
   }));
 
-  EXPECT_CALL(subscriber, OnReceive("123", "hello"));
+  EXPECT_CALL(subscriber, OnReceive("123"));
 
   fetcher.Subscribe(kOrigin, &subscriber);
 }
@@ -105,7 +104,7 @@ TEST_F(SmsFetcherImplTest, ReceiveFromRemoteProvider) {
             std::move(callback).Run(sms);
           }));
 
-  EXPECT_CALL(subscriber, OnReceive("123", sms));
+  EXPECT_CALL(subscriber, OnReceive("123"));
 
   fetcher.Subscribe(url::Origin::Create(GURL("https://a.com")), &subscriber);
 }
@@ -121,7 +120,7 @@ TEST_F(SmsFetcherImplTest, RemoteProviderTimesOut) {
             std::move(callback).Run(base::nullopt);
           }));
 
-  EXPECT_CALL(subscriber, OnReceive(_, _)).Times(0);
+  EXPECT_CALL(subscriber, OnReceive(_)).Times(0);
 
   fetcher.Subscribe(url::Origin::Create(GURL("https://a.com")), &subscriber);
 }
@@ -137,7 +136,7 @@ TEST_F(SmsFetcherImplTest, ReceiveFromOtherOrigin) {
             std::move(callback).Run("@b.com #123");
           }));
 
-  EXPECT_CALL(subscriber, OnReceive(_, _)).Times(0);
+  EXPECT_CALL(subscriber, OnReceive(_)).Times(0);
 
   fetcher.Subscribe(url::Origin::Create(GURL("https://a.com")), &subscriber);
 }
@@ -160,7 +159,7 @@ TEST_F(SmsFetcherImplTest, ReceiveFromBothProviders) {
   }));
 
   // Expects subscriber to be notified just once.
-  EXPECT_CALL(subscriber, OnReceive("123", sms));
+  EXPECT_CALL(subscriber, OnReceive("123"));
 
   fetcher.Subscribe(url::Origin::Create(GURL("https://a.com")), &subscriber);
 }
@@ -176,11 +175,11 @@ TEST_F(SmsFetcherImplTest, OneOriginTwoSubscribers) {
   fetcher.Subscribe(kOrigin, &subscriber1);
   fetcher.Subscribe(kOrigin, &subscriber2);
 
-  EXPECT_CALL(subscriber1, OnReceive("123", "foo"));
-  provider()->NotifyReceive(kOrigin, "123", "foo");
+  EXPECT_CALL(subscriber1, OnReceive("123"));
+  provider()->NotifyReceive(kOrigin, "123");
 
-  EXPECT_CALL(subscriber2, OnReceive("456", "bar"));
-  provider()->NotifyReceive(kOrigin, "456", "bar");
+  EXPECT_CALL(subscriber2, OnReceive("456"));
+  provider()->NotifyReceive(kOrigin, "456");
 }
 
 TEST_F(SmsFetcherImplTest, TwoOriginsTwoSubscribers) {
@@ -194,11 +193,11 @@ TEST_F(SmsFetcherImplTest, TwoOriginsTwoSubscribers) {
   fetcher.Subscribe(kOrigin1, &subscriber1);
   fetcher.Subscribe(kOrigin2, &subscriber2);
 
-  EXPECT_CALL(subscriber2, OnReceive("456", "bar"));
-  provider()->NotifyReceive(kOrigin2, "456", "bar");
+  EXPECT_CALL(subscriber2, OnReceive("456"));
+  provider()->NotifyReceive(kOrigin2, "456");
 
-  EXPECT_CALL(subscriber1, OnReceive("123", "foo"));
-  provider()->NotifyReceive(kOrigin1, "123", "foo");
+  EXPECT_CALL(subscriber1, OnReceive("123"));
+  provider()->NotifyReceive(kOrigin1, "123");
 }
 
 TEST_F(SmsFetcherImplTest, SubscribeIsIdempotent) {

content/browser/sms/sms_provider.cc

@@ -38,14 +38,13 @@ void SmsProvider::RemoveObserver(const Observer* observer) {
 void SmsProvider::NotifyReceive(const std::string& sms) {
   base::Optional<SmsParser::Result> result = SmsParser::Parse(sms);
   if (result)
-    NotifyReceive(result->origin, result->one_time_code, sms);
+    NotifyReceive(result->origin, result->one_time_code);
 }
 
 void SmsProvider::NotifyReceive(const url::Origin& origin,
-                                const std::string& one_time_code,
-                                const std::string& sms) {
+                                const std::string& one_time_code) {
   for (Observer& obs : observers_) {
-    bool handled = obs.OnReceive(origin, one_time_code, sms);
+    bool handled = obs.OnReceive(origin, one_time_code);
     if (handled) {
       break;
     }

content/browser/sms/sms_provider.h

@@ -25,11 +25,10 @@ class CONTENT_EXPORT SmsProvider {
  public:
   class Observer : public base::CheckedObserver {
    public:
-    // Receive an |sms| from an origin. Return true if the message is
+    // Receive an |one_time_code| from an origin. Return true if the message is
     // handled, which stops its propagation to other observers.
     virtual bool OnReceive(const url::Origin&,
-                           const std::string& one_time_code,
-                           const std::string& sms) = 0;
+                           const std::string& one_time_code) = 0;
   };
 
   SmsProvider();
@@ -43,9 +42,7 @@ class CONTENT_EXPORT SmsProvider {
 
   void AddObserver(Observer*);
   void RemoveObserver(const Observer*);
-  void NotifyReceive(const url::Origin&,
-                     const std::string& one_time_code,
-                     const std::string& sms);
+  void NotifyReceive(const url::Origin&, const std::string& one_time_code);
   void NotifyReceive(const std::string& sms);
   bool HasObservers();
 

content/browser/sms/sms_provider_android_unittest.cc

@@ -29,10 +29,8 @@ class MockObserver : public SmsProvider::Observer {
   MockObserver() = default;
   ~MockObserver() override = default;
 
-  MOCK_METHOD3(OnReceive,
-               bool(const Origin&,
-                    const std::string& one_time_code,
-                    const std::string& sms));
+  MOCK_METHOD2(OnReceive,
+               bool(const Origin&, const std::string& one_time_code));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockObserver);
@@ -84,21 +82,18 @@ class SmsProviderAndroidTest : public RenderViewHostTestHarness {
 
 TEST_F(SmsProviderAndroidTest, Retrieve) {
   std::string test_url = "https://google.com";
-  std::string expected_sms = "Hi\n@google.com #123";
 
-  EXPECT_CALL(*observer(),
-              OnReceive(Origin::Create(GURL(test_url)), _, expected_sms));
+  EXPECT_CALL(*observer(), OnReceive(Origin::Create(GURL(test_url)), "ABC123"));
   provider().Retrieve();
-  TriggerSms(expected_sms);
+  TriggerSms("Hi\n@google.com #ABC123");
 }
 
 TEST_F(SmsProviderAndroidTest, IgnoreBadSms) {
   std::string test_url = "https://google.com";
-  std::string good_sms = "Hi\n@google.com #123";
+  std::string good_sms = "Hi\n@google.com #ABC123";
   std::string bad_sms = "Hi\n@b.com";
 
-  EXPECT_CALL(*observer(),
-              OnReceive(Origin::Create(GURL(test_url)), _, good_sms));
+  EXPECT_CALL(*observer(), OnReceive(Origin::Create(GURL(test_url)), "ABC123"));
 
   provider().Retrieve();
   TriggerSms(bad_sms);
@@ -106,17 +101,15 @@ TEST_F(SmsProviderAndroidTest, IgnoreBadSms) {
 }
 
 TEST_F(SmsProviderAndroidTest, TaskTimedOut) {
-  EXPECT_CALL(*observer(), OnReceive(_, _, _)).Times(0);
+  EXPECT_CALL(*observer(), OnReceive(_, _)).Times(0);
   provider().Retrieve();
   TriggerTimeout();
 }
 
 TEST_F(SmsProviderAndroidTest, OneObserverTwoTasks) {
   std::string test_url = "https://google.com";
-  std::string expected_sms = "Hi\n@google.com #123";
 
-  EXPECT_CALL(*observer(),
-              OnReceive(Origin::Create(GURL(test_url)), _, expected_sms));
+  EXPECT_CALL(*observer(), OnReceive(Origin::Create(GURL(test_url)), "ABC123"));
 
   // Two tasks for when 1 request gets aborted but the task is still triggered.
   provider().Retrieve();
@@ -124,7 +117,7 @@ TEST_F(SmsProviderAndroidTest, OneObserverTwoTasks) {
 
   // First timeout should be ignored.
   TriggerTimeout();
-  TriggerSms(expected_sms);
+  TriggerSms("Hi\n@google.com #ABC123");
 }
 
 }  // namespace content

content/browser/sms/sms_service.cc

@@ -45,7 +45,7 @@ SmsService::SmsService(
 
 SmsService::~SmsService() {
   if (callback_)
-    Process(SmsStatus::kTimeout, base::nullopt, base::nullopt);
+    Process(SmsStatus::kTimeout, base::nullopt);
 }
 
 // static
@@ -69,21 +69,19 @@ void SmsService::Receive(ReceiveCallback callback) {
   WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host());
   if (!web_contents->GetDelegate()) {
-    std::move(callback).Run(SmsStatus::kCancelled, base::nullopt,
-                            base::nullopt);
+    std::move(callback).Run(SmsStatus::kCancelled, base::nullopt);
     return;
   }
 
   if (callback_) {
-    std::move(callback_).Run(SmsStatus::kCancelled, base::nullopt,
-                             base::nullopt);
+    std::move(callback_).Run(SmsStatus::kCancelled, base::nullopt);
     fetcher_->Unsubscribe(origin_, this);
   }
 
   start_time_ = base::TimeTicks::Now();
   callback_ = std::move(callback);
 
-  // |one_time_code_|, |sms_| and prompt are still present from the previous
+  // |one_time_code_| and prompt are still present from the previous
   // request so a new subscription is unnecessary.
   if (prompt_open_) {
     // TODO(crbug.com/1024598): Add UMA histogram.
@@ -93,18 +91,15 @@ void SmsService::Receive(ReceiveCallback callback) {
   fetcher_->Subscribe(origin_, this);
 }
 
-void SmsService::OnReceive(const std::string& one_time_code,
-                           const std::string& sms) {
+void SmsService::OnReceive(const std::string& one_time_code) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   DCHECK(!one_time_code_);
-  DCHECK(!sms_);
   DCHECK(!start_time_.is_null());
 
   RecordSmsReceiveTime(base::TimeTicks::Now() - start_time_);
 
   one_time_code_ = one_time_code;
-  sms_ = sms;
   receive_time_ = base::TimeTicks::Now();
 
   OpenInfoBar(one_time_code);
@@ -112,7 +107,7 @@ void SmsService::OnReceive(const std::string& one_time_code,
 
 void SmsService::Abort() {
   DCHECK(callback_);
-  Process(SmsStatus::kAborted, base::nullopt, base::nullopt);
+  Process(SmsStatus::kAborted, base::nullopt);
 }
 
 void SmsService::NavigationEntryCommitted(
@@ -137,7 +132,7 @@ void SmsService::OpenInfoBar(const std::string& one_time_code) {
   WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host());
   if (!web_contents->GetDelegate()) {
-    Process(SmsStatus::kCancelled, base::nullopt, base::nullopt);
+    Process(SmsStatus::kCancelled, base::nullopt);
     return;
   }
 
@@ -149,11 +144,10 @@ void SmsService::OpenInfoBar(const std::string& one_time_code) {
 }
 
 void SmsService::Process(blink::mojom::SmsStatus status,
-                         base::Optional<std::string> one_time_code,
-                         base::Optional<std::string> sms) {
+                         base::Optional<std::string> one_time_code) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(callback_);
-  std::move(callback_).Run(status, one_time_code, sms);
+  std::move(callback_).Run(status, one_time_code);
   CleanUp();
 }
 
@@ -161,7 +155,6 @@ void SmsService::OnConfirm() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   DCHECK(one_time_code_);
-  DCHECK(sms_);
   DCHECK(!receive_time_.is_null());
   RecordContinueOnSuccessTime(base::TimeTicks::Now() - receive_time_);
 
@@ -172,7 +165,7 @@ void SmsService::OnConfirm() {
     CleanUp();
     return;
   }
-  Process(SmsStatus::kSuccess, one_time_code_, sms_);
+  Process(SmsStatus::kSuccess, one_time_code_);
 }
 
 void SmsService::OnCancel() {
@@ -189,7 +182,7 @@ void SmsService::OnCancel() {
     CleanUp();
     return;
   }
-  Process(SmsStatus::kCancelled, base::nullopt, base::nullopt);
+  Process(SmsStatus::kCancelled, base::nullopt);
 }
 
 void SmsService::CleanUp() {
@@ -198,7 +191,6 @@ void SmsService::CleanUp() {
   // upon prompt confirmation.
   if (!prompt_open_) {
     one_time_code_.reset();
-    sms_.reset();
     receive_time_ = base::TimeTicks();
   }
   start_time_ = base::TimeTicks();

content/browser/sms/sms_service.h

@@ -54,8 +54,7 @@ class CONTENT_EXPORT SmsService
   void Abort() override;
 
   // content::SmsQueue::Subscriber
-  void OnReceive(const std::string& one_time_code,
-                 const std::string& sms) override;
+  void OnReceive(const std::string& one_time_code) override;
 
  protected:
   // content::WebContentsObserver:
@@ -65,8 +64,7 @@ class CONTENT_EXPORT SmsService
  private:
   void OpenInfoBar(const std::string& one_time_code);
   void Process(blink::mojom::SmsStatus,
-               base::Optional<std::string> one_time_code,
-               base::Optional<std::string> sms);
+               base::Optional<std::string> one_time_code);
   void CleanUp();
 
   // Called when the user manually clicks the 'Enter code' button.
@@ -84,7 +82,6 @@ class CONTENT_EXPORT SmsService
   bool prompt_open_ = false;
 
   ReceiveCallback callback_;
-  base::Optional<std::string> sms_;
   base::Optional<std::string> one_time_code_;
   base::TimeTicks start_time_;
   base::TimeTicks receive_time_;

content/public/browser/sms_fetcher.h

@@ -27,11 +27,10 @@ class SmsFetcher {
 
   class Subscriber : public base::CheckedObserver {
    public:
-    // Receive an |sms| and a |one_time_code| from subscribed origin. The
-    // |one_time_code| is parsed from |sms| as an alphanumeric value which the
-    // origin uses to verify the ownership of the phone number.
-    virtual void OnReceive(const std::string& one_time_code,
-                           const std::string& sms) = 0;
+    // Receive a |one_time_code| from subscribed origin. The |one_time_code|
+    // is parsed from |sms| as an alphanumeric value which the origin uses
+    // to verify the ownership of the phone number.
+    virtual void OnReceive(const std::string& one_time_code) = 0;
   };
 
   // Idempotent function that subscribes to incoming SMSes from SmsProvider.

third_party/blink/public/mojom/sms/sms_receiver.mojom

@@ -20,12 +20,11 @@ enum SmsStatus {
 // associated: there is an origin associated with a request that is multiplexed
 // through one instance on a storage partition.
 interface SmsReceiver {
-  // TODO(crbug.com/1045526): Remove |message| once we stop using nagivator.sms.
   // Retrieves the next SMS message that arrives on the phone that is addressed
   // to the caller's origin.
   // Returns the raw content of the received SMS.
   // |otp|, |message| is only set if status == kSuccess.
-  Receive() => (SmsStatus status, string? otp, string? message);
+  Receive() => (SmsStatus status, string? otp);
   // Aborts the current retrieval process and resolves it with an
   // kAborted SmsStatus.
   Abort();

third_party/blink/renderer/modules/credentialmanager/credentials_container.cc

@@ -479,8 +479,7 @@ void OnGetAssertionComplete(
 void OnSmsReceive(ScriptPromiseResolver* resolver,
                   base::TimeTicks start_time,
                   mojom::blink::SmsStatus status,
-                  const WTF::String& otp,
-                  const WTF::String& sms) {
+                  const WTF::String& otp) {
   AssertSecurityRequirementsBeforeResponse(
       resolver, RequiredOriginType::kSecureAndSameWithAncestors);
   auto& document =

third_party/blink/web_tests/http/tests/credentialmanager/resources/mock-navigator-credentials.js

@@ -224,7 +224,7 @@ class MockSmsReceiver {
 
   // Mock functions:
   async receive() {
-    return {status: this.status_, otp: this.otp_, message: this.message_};
+    return {status: this.status_, otp: this.otp_};
   }
 
   async abort() {}
@@ -232,7 +232,6 @@ class MockSmsReceiver {
   // Resets state of mock SmsReceiver.
   reset() {
     this.otp_ = '';
-    this.message_ = '';
     this.status_ = blink.mojom.SmsStatus.kTimeout;
   }
 
@@ -240,10 +239,6 @@ class MockSmsReceiver {
     this.otp_ = otp;
   }
 
-  setMessage(message) {
-    this.message_ = message;
-  }
-
   setStatus(status) {
     this.status_ = status;
   }