Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/android/infobars/infobar_android.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/infobar_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 10 matching lines @@
 const int InfoBar::kSeparatorLineHeight = 1;
 const int InfoBar::kDefaultArrowTargetHeight = 9;
 const int InfoBar::kMaximumArrowTargetHeight = 24;
 const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight;
 const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
 const int InfoBar::kDefaultBarTargetHeight = 36;
 
 
 // InfoBarAndroid -------------------------------------------------------------
 
-InfoBarAndroid::InfoBarAndroid(scoped_ptr<InfoBarDelegate> delegate)
-    : InfoBar(delegate.Pass()) {
+InfoBarAndroid::InfoBarAndroid(InfoBarService* owner, InfoBarDelegate* delegate)
+    : InfoBar(owner, delegate) {
 }
 
 InfoBarAndroid::~InfoBarAndroid() {
 }
 
 void InfoBarAndroid::ReassignJavaInfoBar(InfoBarAndroid* replacement) {
   DCHECK(replacement);
   if (!java_info_bar_.is_null()) {
     replacement->set_java_infobar(java_info_bar_);
     java_info_bar_.Reset();
@@ skipping 33 matching lines @@
 int InfoBarAndroid::GetEnumeratedIconId() {
   return ResourceMapper::MapFromChromiumId(delegate()->GetIconID());
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterNativeInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }