Infobar system refactor.

chrome/browser/media/webrtc_browsertest_base.h

Index: chrome/browser/media/webrtc_browsertest_base.h
===================================================================
--- chrome/browser/media/webrtc_browsertest_base.h	(revision 226624)
+++ 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.
@@ -43,11 +43,9 @@
                     const std::string& constraints);
 
  private:
-  MediaStreamInfoBarDelegate* GetUserMediaAndWaitForInfoBar(
-      content::WebContents* tab_contents,
-      const std::string& constraints);
-  void CloseInfoBarInTab(content::WebContents* tab_contents,
-                         MediaStreamInfoBarDelegate* infobar);
+  InfoBar* GetUserMediaAndWaitForInfoBar(content::WebContents* tab_contents,
+                                         const std::string& constraints);
+  void CloseInfoBarInTab(content::WebContents* tab_contents, InfoBar* infobar);
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcTestBase);
 };