From 3c15539809d24d0ae28c526651e01ba2fe85c751 Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Mon, 8 Feb 2021 20:47:36 +0000
Subject: [PATCH] Uplift of #7862 (squashed) to beta

---
 .../browser/toolbar/top/BraveToolbarLayout.java     | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
index a8496f4c846b..1b0db99dc921 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -124,8 +124,6 @@ public abstract class BraveToolbarLayout extends ToolbarLayout
     public static final String PREF_HIDE_BRAVE_REWARDS_ICON = "hide_brave_rewards_icon";
     private static final String JAPAN_COUNTRY_CODE = "JP";
 
-    private boolean shouldShowHttpsUpgradeToolitip;
-
     private static final long MB_10 = 10000000;
     private static final long MINUTES_10 = 10 * 60 * 1000;
 
@@ -248,9 +246,6 @@ public void blockEvent(int tabId, String block_type, String subresource) {
                                                              .RESOURCE_IDENTIFIER_TRACKERS))) {
                     addStatsToDb(block_type, subresource, currentTab.getUrlString());
                 }
-                if (mBraveShieldsButton != null && mBraveShieldsHandler != null
-                        && !mBraveShieldsHandler.isShowing())
-                    checkForTooltip(currentTab);
             }
 
             @Override
@@ -357,9 +352,9 @@ public void onPageLoadFinished(final Tab tab, String url) {
                                 getContext(), RetentionNotificationUtil.BRAVE_STATS_TIME);
                         OnboardingPrefManager.getInstance().setTimeSavedNotificationStarted(true);
                     }
-                    if (shouldShowHttpsUpgradeToolitip) {
-                        showTooltip(ShieldsTooltipEnum.HTTPS_UPGRADE_TOOLTIP);
-                        shouldShowHttpsUpgradeToolitip = false;
+                    if (mBraveShieldsButton != null && mBraveShieldsHandler != null
+                        && !mBraveShieldsHandler.isShowing()) {
+                      checkForTooltip(tab);
                     }
                 }
             }
@@ -429,7 +424,7 @@ && shouldShowVideoTooltip(tab.getUrlString())) {
             } else if (!BraveShieldsUtils.hasShieldsTooltipShown(
                                BraveShieldsUtils.PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP)
                     && mBraveShieldsHandler.getHttpsUpgradeCount(tab.getId()) > 0) {
-                shouldShowHttpsUpgradeToolitip = true;
+                showTooltip(ShieldsTooltipEnum.HTTPS_UPGRADE_TOOLTIP);
                 BraveShieldsUtils.setShieldsTooltipShown(
                         BraveShieldsUtils.PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP, true);
             }