Remove InfoBarDelegate::web_contents()

chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc

 // Copyright 2014 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/infobars/auto_login_infobar_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 71 matching lines @@
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginSuccess(JNIEnv* env,
                                                    jobject obj,
                                                    jstring result) {
   if (!infobar()->owner())
      return;  // We're closing; don't call anything, it might access the owner.
 
   // TODO(miguelg): Test whether the Stop() and RemoveInfoBar() calls here are
   // necessary, or whether OpenURL() will do this for us.
-  content::WebContents* contents = web_contents();
+  content::WebContents* contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
   contents->Stop();
   infobar()->RemoveSelf();
   // WARNING: |this| may be deleted at this point!  Do not access any members!
   contents->OpenURL(content::OpenURLParams(
       GURL(base::android::ConvertJavaStringToUTF8(env, result)),
       content::Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK,
       false));
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginFailed(JNIEnv* env, jobject obj) {
   if (!infobar()->owner())
      return;  // We're closing; don't call anything, it might access the owner.
 
   // TODO(miguelg): Using SimpleAlertInfoBarDelegate::Create() animates in a new
   // infobar while we animate the current one closed.  It would be better to use
   // ReplaceInfoBar().
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
+  InfoBarService* infobar_service = InfoBarService::FromWebContents(
+      InfoBarService::WebContentsFromInfoBar(infobar()));
   DCHECK(infobar_service);
   SimpleAlertInfoBarDelegate::Create(
       infobar_service, IDR_INFOBAR_WARNING,
       l10n_util::GetStringUTF16(IDS_AUTO_LOGIN_FAILED), false);
   infobar()->RemoveSelf();
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginDismiss(JNIEnv* env, jobject obj) {
   infobar()->RemoveSelf();
 }
 
 bool AutoLoginInfoBarDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }