Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/chrome_quota_permission_context.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/chrome_quota_permission_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 #include "webkit/common/quota/quota_types.h"
 
 
 
 // RequestQuotaInfoBarDelegate ------------------------------------------------
 
 namespace {
 
 class RequestQuotaInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a request quota infobar and delegate and adds the infobar to
-  // |infobar_service|.
+  // Creates a request quota infobar delegate and adds it to |infobar_service|.
   static void Create(
       InfoBarService* infobar_service,
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
       int64 requested_quota,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
 
  private:
   RequestQuotaInfoBarDelegate(
+      InfoBarService* infobar_service,
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
       int64 requested_quota,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
   virtual ~RequestQuotaInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const OVERRIDE;
@@ skipping 11 matching lines @@
 };
 
 // static
 void RequestQuotaInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
     int64 requested_quota,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new RequestQuotaInfoBarDelegate(
-          context, origin_url, requested_quota, display_languages, callback))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new RequestQuotaInfoBarDelegate(infobar_service, context, origin_url,
+                                      requested_quota, display_languages,
+                                      callback)));
 }
 
 RequestQuotaInfoBarDelegate::RequestQuotaInfoBarDelegate(
+    InfoBarService* infobar_service,
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
     int64 requested_quota,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       context_(context),
       origin_url_(origin_url),
       display_languages_(display_languages),
       requested_quota_(requested_quota),
       callback_(callback) {
 }
 
 RequestQuotaInfoBarDelegate::~RequestQuotaInfoBarDelegate() {
   if (!callback_.is_null()) {
     context_->DispatchCallbackOnIOThread(
@@ skipping 99 matching lines @@
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeQuotaPermissionContext::DispatchCallbackOnIOThread,
                    this, callback, response));
     return;
   }
 
   callback.Run(response);
 }
 
 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}