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

chrome/browser/android/tab_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
@@ skipping 249 matching lines @@
       if (!settings->IsBlockageIndicated(CONTENT_SETTINGS_TYPE_POPUPS)) {
         // TODO(dfalcantara): Create an InfoBarDelegate to keep the
         // PopupBlockedInfoBar logic native-side instead of straddling the JNI
         // boundary.
         int num_popups = 0;
         PopupBlockerTabHelper* popup_blocker_helper =
             PopupBlockerTabHelper::FromWebContents(web_contents());
         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);
       }
       break;
     }
     case chrome::NOTIFICATION_FAVICON_UPDATED:
       Java_TabBase_onFaviconUpdated(env, weak_java_tab_.get(env).obj());
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
@@ skipping 129 matching lines @@
   if (print_view_manager == NULL)
     return false;
 
   print_view_manager->PrintNow();
   return true;
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }