Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/media/media_stream_infobar_delegate.h

Index: trunk/src/chrome/browser/media/media_stream_infobar_delegate.h
===================================================================
--- trunk/src/chrome/browser/media/media_stream_infobar_delegate.h	(revision 238401)
+++ trunk/src/chrome/browser/media/media_stream_infobar_delegate.h	(working copy)
@@ -22,10 +22,10 @@
   virtual ~MediaStreamInfoBarDelegate();
 
   // Handles a permission request (in |request|) for |web_contents|.  If this
-  // involves prompting the user, creates a media stream infobar and delegate,
-  // then checks for an existing infobar for |web_contents| and replaces it if
-  // found, or just adds the new infobar otherwise.  Returns whether an infobar
-  // was created.
+  // involves prompting the user, creates a media stream infobar delegate, then
+  // checks for an existing infobar for |web_contents| and replaces it if found,
+  // or just adds the new infobar otherwise.  Returns whether an infobar was
+  // created.
   static bool Create(content::WebContents* web_contents,
                      const content::MediaStreamRequest& request,
                      const content::MediaResponseCallback& callback);
@@ -33,7 +33,8 @@
  private:
   friend class WebRtcTestBase;
 
-  explicit MediaStreamInfoBarDelegate(
+  MediaStreamInfoBarDelegate(
+      InfoBarService* infobar_service,
       scoped_ptr<MediaStreamDevicesController> controller);
 
   // ConfirmInfoBarDelegate: