Merge r250184: [Android] Remove the "Always show" button for blocked popups if the setting is...

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index e317c04d11a9aa1357a4cb6ef3475a95701b920a..7e5f54847b22f851bb7b7476f38a2cc9a2342029 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -267,11 +267,8 @@ void TabAndroid::Observe(int type,
         if (popup_blocker_helper)
           num_popups = popup_blocker_helper->GetBlockedPopupsCount();
 
-        if (num_popups > 0) {
-          PopupBlockedInfoBarDelegate::Create(
-              InfoBarService::FromWebContents(web_contents()),
-              num_popups);
-        }
+        if (num_popups > 0)
+          PopupBlockedInfoBarDelegate::Create(web_contents(), num_popups);
 
         settings->SetBlockageHasBeenIndicated(CONTENT_SETTINGS_TYPE_POPUPS);
       }