Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/pepper_broker_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/pepper_broker_infobar_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
@@ skipping 68 matching lines @@
   ContentSetting setting =
       content_settings->GetContentSetting(url, url,
                                           CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
                                           std::string());
 
   if (setting == CONTENT_SETTING_ASK) {
     content::RecordAction(
         content::UserMetricsAction("PPAPI.BrokerInfobarDisplayed"));
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
-    infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-        scoped_ptr<ConfirmInfoBarDelegate>(new PepperBrokerInfoBarDelegate(
-            url, plugin_path,
+    infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+        new PepperBrokerInfoBarDelegate(
+            infobar_service, url, plugin_path,
             profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
-            content_settings, tab_content_settings, callback))));
+            content_settings, tab_content_settings, callback)));
     return;
   }
 
   bool allowed = (setting == CONTENT_SETTING_ALLOW);
   content::RecordAction(allowed ?
       content::UserMetricsAction("PPAPI.BrokerSettingAllow") :
       content::UserMetricsAction("PPAPI.BrokerSettingDeny"));
   tab_content_settings->SetPepperBrokerAllowed(allowed);
   callback.Run(allowed);
 }
 
 PepperBrokerInfoBarDelegate::PepperBrokerInfoBarDelegate(
+    InfoBarService* infobar_service,
     const GURL& url,
     const base::FilePath& plugin_path,
     const std::string& languages,
     HostContentSettingsMap* content_settings,
     TabSpecificContentSettings* tab_content_settings,
     const base::Callback<void(bool)>& callback)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       url_(url),
       plugin_path_(plugin_path),
       languages_(languages),
       content_settings_(content_settings),
       tab_content_settings_(tab_content_settings),
       callback_(callback) {
 }
 
 PepperBrokerInfoBarDelegate::~PepperBrokerInfoBarDelegate() {
   if (!callback_.is_null())
@@ skipping 54 matching lines @@
       content::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
   callback_.Run(result);
   callback_ = base::Callback<void(bool)>();
   content_settings_->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(url_),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
       std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
   tab_content_settings_->SetPepperBrokerAllowed(result);
 }