Remove dependency of infobars component on the embedder

chrome/browser/plugins/plugin_infobar_delegates.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/plugins/plugin_infobar_delegates.h"
 
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 73 matching lines @@
 
 // OutdatedPluginInfoBarDelegate ----------------------------------------------
 
 void OutdatedPluginInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata) {
   // Copy the name out of |plugin_metadata| now, since the Pass() call below
   // will make it impossible to get at.
   base::string16 name(plugin_metadata->name());
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+  infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate(
-          installer, plugin_metadata.Pass(), l10n_util::GetStringFUTF16(
-              (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ?
-                  IDS_PLUGIN_OUTDATED_PROMPT : IDS_PLUGIN_DOWNLOADING,
+          installer, plugin_metadata.Pass(),
+          l10n_util::GetStringFUTF16(
+              (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE)
+                  ? IDS_PLUGIN_OUTDATED_PROMPT
+                  : IDS_PLUGIN_DOWNLOADING,

[Peter Kasting, 2014/12/19 23:06:23]

Nit: Don't rewrap ?: linebreaking (2 places)

[sdefresne, 2014/12/20 11:30:55]

Sorry, I reformatted everything with clang-format and I just accepted what it
gave me. Reverted.

               name)))));
 }
 
 OutdatedPluginInfoBarDelegate::OutdatedPluginInfoBarDelegate(
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     const base::string16& message)
     : PluginInfoBarDelegate(plugin_metadata->identifier()),
       WeakPluginInstallerObserver(installer),
       plugin_metadata_(plugin_metadata.Pass()),
@@ skipping 116 matching lines @@
     scoped_ptr<PluginMetadata> plugin_metadata,
     const InstallCallback& callback) {
   base::string16 name(plugin_metadata->name());
 #if defined(OS_WIN)
   if (base::win::IsMetroProcess()) {
     PluginMetroModeInfoBarDelegate::Create(
         infobar_service, PluginMetroModeInfoBarDelegate::MISSING_PLUGIN, name);
     return;
   }
 #endif
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+  infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new PluginInstallerInfoBarDelegate(
           installer, plugin_metadata.Pass(), callback, true,
           l10n_util::GetStringFUTF16(
-              (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ?
-                  IDS_PLUGININSTALLER_INSTALLPLUGIN_PROMPT :
-                  IDS_PLUGIN_DOWNLOADING,
+              (installer->state() == PluginInstaller::INSTALLER_STATE_IDLE)
+                  ? IDS_PLUGININSTALLER_INSTALLPLUGIN_PROMPT
+                  : IDS_PLUGIN_DOWNLOADING,
               name)))));
 }
 
 void PluginInstallerInfoBarDelegate::Replace(
     infobars::InfoBar* infobar,
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     bool new_install,
     const base::string16& message) {
   DCHECK(infobar->owner());
-  infobar->owner()->ReplaceInfoBar(infobar,
-      ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
-          new PluginInstallerInfoBarDelegate(
+  infobar->owner()->ReplaceInfoBar(
+      infobar,
+      infobar->owner()->CreateConfirmInfoBar(
+          scoped_ptr<ConfirmInfoBarDelegate>(new PluginInstallerInfoBarDelegate(
               installer, plugin_metadata.Pass(),
               PluginInstallerInfoBarDelegate::InstallCallback(), new_install,
               message))));
 }
 
 PluginInstallerInfoBarDelegate::PluginInstallerInfoBarDelegate(
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata,
     const InstallCallback& callback,
     bool new_install,
@@ skipping 93 matching lines @@
 
 #if defined(OS_WIN)
 
 // PluginMetroModeInfoBarDelegate ---------------------------------------------
 
 // static
 void PluginMetroModeInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PluginMetroModeInfoBarDelegate::Mode mode,
     const base::string16& name) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
+  infobar_service->AddInfoBar(
+      infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
           new PluginMetroModeInfoBarDelegate(mode, name))));
 }
 
 PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
     PluginMetroModeInfoBarDelegate::Mode mode,
     const base::string16& name)
     : ConfirmInfoBarDelegate(),
       mode_(mode),
       name_(name) {
 }
@@ skipping 54 matching lines @@
               "https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 #endif  // defined(OS_WIN)
 
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)