Revert 238283 "Infobar system refactor."

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

Index: trunk/src/chrome/browser/media/webrtc_browsertest_base.h
===================================================================
--- trunk/src/chrome/browser/media/webrtc_browsertest_base.h	(revision 238401)
+++ trunk/src/chrome/browser/media/webrtc_browsertest_base.h	(working copy)
@@ -9,12 +9,12 @@
 
 #include "chrome/test/base/in_process_browser_test.h"
 
-class InfoBar;
-
 namespace content {
 class WebContents;
 }
 
+class MediaStreamInfoBarDelegate;
+
 // Base class for WebRTC browser tests with useful primitives for interacting
 // getUserMedia. We use inheritance here because it makes the test code look
 // as clean as it can be.
@@ -51,9 +51,10 @@
 
  private:
   void CloseInfoBarInTab(content::WebContents* tab_contents,
-                         InfoBar* infobar) const;
-  InfoBar* GetUserMediaAndWaitForInfoBar(content::WebContents* tab_contents,
-                                         const std::string& constraints) const;
+                         MediaStreamInfoBarDelegate* infobar) const;
+  MediaStreamInfoBarDelegate* GetUserMediaAndWaitForInfoBar(
+      content::WebContents* tab_contents,
+      const std::string& constraints) const;
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcTestBase);
 };