Fix UAF in Origin Info Bubble and permission settings UI.

chrome/browser/ui/android/connection_info_popup_android.cc

 // Copyright 2015 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/ui/android/connection_info_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 74 matching lines @@
       web_contents->GetController().GetVisibleEntry();
   if (nav_entry == NULL)
     return;
 
   popup_jobject_.Reset(env, java_website_settings_pop);
 
   presenter_.reset(new WebsiteSettings(
       this,
       Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents),
-      InfoBarService::FromWebContents(web_contents),
+      web_contents,
       nav_entry->GetURL(),
       nav_entry->GetSSL(),
       content::CertStore::GetInstance()));
 }
 
 ConnectionInfoPopupAndroid::~ConnectionInfoPopupAndroid() {
 }
 
 void ConnectionInfoPopupAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
@@ skipping 80 matching lines @@
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
 // static
 bool
 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }