Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc

 // Copyright 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/ui/omnibox/alternate_nav_infobar_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/shortcuts_backend.h"
 #include "chrome/browser/history/shortcuts_backend_factory.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
-AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() {
-}
-
 // static
 void AlternateNavInfoBarDelegate::Create(
     content::WebContents* web_contents,
     const string16& text,
     const AutocompleteMatch& match,
     const GURL& search_url) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
-  infobar_service->AddInfoBar(AlternateNavInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<AlternateNavInfoBarDelegate>(new AlternateNavInfoBarDelegate(
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new AlternateNavInfoBarDelegate(
+          infobar_service,
           Profile::FromBrowserContext(web_contents->GetBrowserContext()), text,
-          match, search_url))));
+          match, search_url)));
 }
 
 AlternateNavInfoBarDelegate::AlternateNavInfoBarDelegate(
+    InfoBarService* owner,
     Profile* profile,
     const string16& text,
     const AutocompleteMatch& match,
     const GURL& search_url)
-    : InfoBarDelegate(),
+    : InfoBarDelegate(owner),
       profile_(profile),
       text_(text),
       match_(match),
       search_url_(search_url) {
   DCHECK(match_.destination_url.is_valid());
   DCHECK(search_url_.is_valid());
 }
 
-// AlternateNavInfoBarDelegate::CreateInfoBar() is implemented in
-// platform-specific files.
+AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() {
+}
 
 string16 AlternateNavInfoBarDelegate::GetMessageTextWithOffset(
     size_t* link_offset) const {
   const string16 label = l10n_util::GetStringFUTF16(
       IDS_ALTERNATE_NAV_URL_VIEW_LABEL, string16(), link_offset);
   return label;
 }
 
 string16 AlternateNavInfoBarDelegate::GetLinkText() const {
   return UTF8ToUTF16(match_.destination_url.spec());
@@ skipping 27 matching lines @@
   return true;
 }
 
 int AlternateNavInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_ALT_NAV_URL;
 }
 
 InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }