Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/google/google_url_tracker_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/google/google_url_tracker_infobar_delegate.h"
 
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
-InfoBar* GoogleURLTrackerInfoBarDelegate::Create(
+GoogleURLTrackerInfoBarDelegate* GoogleURLTrackerInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     GoogleURLTracker* google_url_tracker,
     const GURL& search_url) {
-  return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new GoogleURLTrackerInfoBarDelegate(
-          google_url_tracker, search_url))));
+  return static_cast<GoogleURLTrackerInfoBarDelegate*>(
+      infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+          new GoogleURLTrackerInfoBarDelegate(
+              infobar_service, google_url_tracker, search_url))));
 }
 
 bool GoogleURLTrackerInfoBarDelegate::Accept() {
   google_url_tracker_->AcceptGoogleURL(true);
   return false;
 }
 
 bool GoogleURLTrackerInfoBarDelegate::Cancel() {
   google_url_tracker_->CancelGoogleURL();
   return false;
@@ skipping 15 matching lines @@
   if (redo_search) {
     // Re-do the user's search on the new domain.
     DCHECK(search_url_.is_valid());
     url_canon::Replacements<char> replacements;
     const std::string& host(google_url_tracker_->fetched_google_url().host());
     replacements.SetHost(host.data(), url_parse::Component(0, host.length()));
     new_search_url = search_url_.ReplaceComponents(replacements);
   }
 
   content::WebContents* contents = web_contents();
-  infobar()->RemoveSelf();
+  owner()->RemoveInfoBar(this);
   // WARNING: |this| may be deleted at this point!  Do not access any members!
 
   if (new_search_url.is_valid()) {
     contents->OpenURL(content::OpenURLParams(
         new_search_url, content::Referrer(), CURRENT_TAB,
         content::PAGE_TRANSITION_GENERATED, false));
   }
 }
 
 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate(
+    InfoBarService* infobar_service,
     GoogleURLTracker* google_url_tracker,
     const GURL& search_url)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       google_url_tracker_(google_url_tracker),
       search_url_(search_url),
       pending_id_(0) {
 }
 
 GoogleURLTrackerInfoBarDelegate::~GoogleURLTrackerInfoBarDelegate() {
 }
 
 string16 GoogleURLTrackerInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
@@ skipping 28 matching lines @@
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   int unique_id = details.entry->GetUniqueID();
   return (unique_id != contents_unique_id()) && (unique_id != pending_id_);
 }