Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc

 // Copyright (c) 2012 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/custom_handlers/register_protocol_handler_infobar_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 void RegisterProtocolHandlerInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     ProtocolHandlerRegistry* registry,
     const ProtocolHandler& handler) {
   content::RecordAction(
       content::UserMetricsAction("RegisterProtocolHandler.InfoBar_Shown"));
 
-  scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new RegisterProtocolHandlerInfoBarDelegate(registry, handler))));
+  scoped_ptr<InfoBarDelegate> infobar(
+      new RegisterProtocolHandlerInfoBarDelegate(infobar_service, registry,
+                                                 handler));
 
   for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
-    InfoBar* existing_infobar = infobar_service->infobar_at(i);
     RegisterProtocolHandlerInfoBarDelegate* existing_delegate =
-        existing_infobar->delegate()->
+        infobar_service->infobar_at(i)->
             AsRegisterProtocolHandlerInfoBarDelegate();
     if ((existing_delegate != NULL) &&
         existing_delegate->handler_.IsEquivalent(handler)) {
-      infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass());
+      infobar_service->ReplaceInfoBar(existing_delegate, infobar.Pass());
       return;
     }
   }
 
   infobar_service->AddInfoBar(infobar.Pass());
 }
 
 RegisterProtocolHandlerInfoBarDelegate::RegisterProtocolHandlerInfoBarDelegate(
+    InfoBarService* infobar_service,
     ProtocolHandlerRegistry* registry,
     const ProtocolHandler& handler)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       registry_(registry),
       handler_(handler) {
 }
 
 RegisterProtocolHandlerInfoBarDelegate::
     ~RegisterProtocolHandlerInfoBarDelegate() {
 }
 
 InfoBarDelegate::InfoBarAutomationType
     RegisterProtocolHandlerInfoBarDelegate::GetInfoBarAutomationType() const {
@@ skipping 65 matching lines @@
 }
 
 string16 RegisterProtocolHandlerInfoBarDelegate::GetProtocolName(
     const ProtocolHandler& handler) const {
   if (handler.protocol() == "mailto")
     return l10n_util::GetStringUTF16(IDS_REGISTER_PROTOCOL_HANDLER_MAILTO_NAME);
   if (handler.protocol() == "webcal")
     return l10n_util::GetStringUTF16(IDS_REGISTER_PROTOCOL_HANDLER_WEBCAL_NAME);
   return UTF8ToUTF16(handler.protocol());
 }