Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/translate/translate_infobar_delegate.h

Index: trunk/src/chrome/browser/translate/translate_infobar_delegate.h
===================================================================
--- trunk/src/chrome/browser/translate/translate_infobar_delegate.h	(revision 238401)
+++ trunk/src/chrome/browser/translate/translate_infobar_delegate.h	(working copy)
@@ -9,8 +9,8 @@
 #include <utility>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/translate/translate_errors.h"
@@ -180,7 +180,8 @@
                                        bool autodetermined_source_language);
 
  protected:
-  TranslateInfoBarDelegate(Type infobar_type,
+  TranslateInfoBarDelegate(InfoBarService* infobar_service,
+                           Type infobar_type,
                            TranslateInfoBarDelegate* old_delegate,
                            const std::string& original_language,
                            const std::string& target_language,
@@ -189,14 +190,10 @@
                            ShortcutConfiguration shortcut_config);
 
  private:
-  friend class TranslationInfoBarTest;
   typedef std::pair<std::string, string16> LanguageNamePair;
 
-  // Returns a translate infobar that owns |delegate|.
-  static scoped_ptr<InfoBar> CreateInfoBar(
-      scoped_ptr<TranslateInfoBarDelegate> delegate);
-
   // InfoBarDelegate:
+  virtual InfoBar* CreateInfoBar(InfoBarService* infobar_service) OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual InfoBarDelegate::Type GetInfoBarType() const OVERRIDE;