Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/android/infobars/confirm_infobar.cc

 // Copyright 2013 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/confirm_infobar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "jni/ConfirmInfoBarDelegate_jni.h"
 
 
 // ConfirmInfoBarDelegate -----------------------------------------------------
 
 // static
-scoped_ptr<InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<ConfirmInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new ConfirmInfoBar(delegate.Pass()));
+InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new ConfirmInfoBar(owner, this);
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
 
-ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate)
-    : InfoBarAndroid(delegate.PassAs<InfoBarDelegate>()),
+ConfirmInfoBar::ConfirmInfoBar(InfoBarService* owner, InfoBarDelegate* delegate)
+    : InfoBarAndroid(owner, delegate),
       java_confirm_delegate_() {
 }
 
 ConfirmInfoBar::~ConfirmInfoBar() {
 }
 
 base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(
     JNIEnv* env) {
   java_confirm_delegate_.Reset(Java_ConfirmInfoBarDelegate_create(env));
   base::android::ScopedJavaLocalRef<jstring> ok_button_text =
@@ skipping 47 matching lines @@
   return (delegate->GetButtons() & button) ?
       delegate->GetButtonLabel(button) : string16();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }