From a65ec85acabf05d01fae922c75ea6286e34a4555 Mon Sep 17 00:00:00 2001
From: Kevin Kuehler <kevin@segfault.fun>
Date: Mon, 12 Jul 2021 10:20:55 -0700
Subject: [PATCH] speedreader: Fix InvokeUi test on bubble

Use the service and not the tab helper. This is due to inconsistent
behavior with the webcontents in the test.

Resolves https://github.com/brave/brave-browser/issues/16903
---
 .../speedreader_bubble_browsertest.cc            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/browser/ui/speedreader/speedreader_bubble_browsertest.cc b/browser/ui/speedreader/speedreader_bubble_browsertest.cc
index 6c872d9c75f..ca59b02ad48 100644
--- a/browser/ui/speedreader/speedreader_bubble_browsertest.cc
+++ b/browser/ui/speedreader/speedreader_bubble_browsertest.cc
@@ -24,7 +24,7 @@ class SpeedreaderBubbleBrowserTest : public DialogBrowserTest {
 
   // DialogBrowserTest:
   void ShowUi(const std::string& name) override {
-    if (tab_helper()->IsSpeedreaderEnabled())
+    if (speedreader_service()->IsEnabled())
       tab_helper()->ShowSpeedreaderBubble();
     else
       tab_helper()->ShowReaderModeBubble();
@@ -47,24 +47,22 @@ class SpeedreaderBubbleBrowserTest : public DialogBrowserTest {
         ActiveWebContents());
   }
 
-  void ToggleSpeedreader() {
-    auto* speedreader_service =
-        speedreader::SpeedreaderServiceFactory::GetForProfile(
-            browser()->profile());
-    speedreader_service->ToggleSpeedreader();
+  speedreader::SpeedreaderService* speedreader_service() {
+    return speedreader::SpeedreaderServiceFactory::GetForProfile(
+        browser()->profile());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(SpeedreaderBubbleBrowserTest,
                        InvokeUi_reader_mode_bubble_basic) {
-  EXPECT_FALSE(tab_helper()->IsSpeedreaderEnabled());
+  EXPECT_FALSE(speedreader_service()->IsEnabled());
   ShowAndVerifyUi();
 }
 
 IN_PROC_BROWSER_TEST_F(SpeedreaderBubbleBrowserTest,
                        InvokeUi_speedreader_mode_bubble_basic) {
-  ToggleSpeedreader();
-  EXPECT_TRUE(tab_helper()->IsSpeedreaderEnabled());
+  speedreader_service()->ToggleSpeedreader();
+  EXPECT_TRUE(speedreader_service()->IsEnabled());
   // We need to navigate somewhere so the host is non-empty. For tests the new
   // tab page is fine.
   NavigateToNewTab();