Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/android/infobars/translate_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/translate_infobar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_helper.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "jni/TranslateInfoBarDelegate_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // TranslateInfoBarDelegate ---------------------------------------------------
 
 // static
-scoped_ptr<InfoBar> TranslateInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<TranslateInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new TranslateInfoBar(delegate.Pass()));
+InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new TranslateInfoBar(owner, this);
 }
 
 
 // TranslateInfoBar -----------------------------------------------------------
 
-TranslateInfoBar::TranslateInfoBar(
-    scoped_ptr<TranslateInfoBarDelegate> delegate)
-    : InfoBarAndroid(delegate.PassAs<InfoBarDelegate>()),
+TranslateInfoBar::TranslateInfoBar(InfoBarService* owner,
+                                   TranslateInfoBarDelegate* delegate)
+    : InfoBarAndroid(owner, delegate),
       java_translate_delegate_() {
 }
 
 TranslateInfoBar::~TranslateInfoBar() {
 }
 
 ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) {
   java_translate_delegate_.Reset(Java_TranslateInfoBarDelegate_create(env));
   TranslateInfoBarDelegate* delegate = GetDelegate();
   std::vector<string16> languages;
@@ skipping 91 matching lines @@
 TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
   return delegate()->AsTranslateInfoBarDelegate();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }