Revert 238283 "Infobar system refactor."

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

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_
 #define CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_
 
 #include <string>
 
 #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.
 class WebRtcTestBase : public InProcessBrowserTest {
  protected:
   // Typical constraints.
   static const char kAudioVideoCallConstraints[];
   static const char kAudioOnlyCallConstraints[];
   static const char kVideoOnlyCallConstraints[];
 
@@ skipping 16 matching lines @@
 
   content::WebContents* OpenPageAndAcceptUserMedia(const GURL& url) const;
 
   void ConnectToPeerConnectionServer(const std::string& peer_name,
                                      content::WebContents* tab_contents) const;
   std::string ExecuteJavascript(const std::string& javascript,
                                 content::WebContents* tab_contents) const;
 
  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);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_