Introduced base class for WebRTC browser tests, cleaned up duplication.

chrome/browser/media/chrome_webrtc_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
+#include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/media/webrtc_log_uploader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 11 matching lines @@
 #endif
 
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_jsep01_test.html";
 
 static const char kTestLoggingSessionId[] = "0123456789abcdef";
 
 // Top-level integration test for WebRTC. Requires a real webcam and microphone
 // on the running system. This test is not meant to run in the main browser
 // test suite since normal tester machines do not have webcams.
-class WebrtcBrowserTest : public InProcessBrowserTest {
+class WebrtcBrowserTest : public WebrtcTestBase {
  public:
   // See comment in test where this class is used for purpose.
   class BrowserMessageFilter : public content::BrowserMessageFilter {
    public:
     explicit BrowserMessageFilter(
         const base::Closure& on_channel_closing)
         : on_channel_closing_(on_channel_closing) {}
 
     virtual void OnChannelClosing() OVERRIDE {
       // Posting on the file thread ensures that the callback is run after
@@ skipping 41 matching lines @@
   // Convenience method which executes the provided javascript in the context
   // of the provided web contents and returns what it evaluated to.
   std::string ExecuteJavascript(const std::string& javascript,
                                 content::WebContents* tab_contents) {
     std::string result;
     EXPECT_TRUE(content::ExecuteScriptAndExtractString(
         tab_contents, javascript, &result));
     return result;
   }
 
-  void GetUserMedia(content::WebContents* tab_contents) {
-    content::WindowedNotificationObserver infobar_added(
-        chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
-        content::NotificationService::AllSources());
-
-    // Request user media: this will launch the media stream info bar.
-    EXPECT_EQ("ok-requested", ExecuteJavascript(
-        "getUserMedia('{video: true, audio: true}');", tab_contents));
-
-    // Wait for the bar to pop up, then accept.
-    infobar_added.Wait();
-    content::Details<InfoBarAddedDetails> details(infobar_added.details());
-    MediaStreamInfoBarDelegate* media_infobar =
-        details->AsMediaStreamInfoBarDelegate();
-    media_infobar->Accept();
-
-    // Wait for WebRTC to call the success callback.
-    EXPECT_TRUE(PollingWaitUntil("obtainGetUserMediaResult();",
-                                 "ok-got-stream",
-                                 tab_contents));
-  }
-
   // Ensures we didn't get any errors asynchronously (e.g. while no javascript
   // call from this test was outstanding).
   // TODO(phoglund): this becomes obsolete when we switch to communicating with
   // the DOM message queue.
   void AssertNoAsynchronousErrors(content::WebContents* tab_contents) {
     EXPECT_EQ("ok-no-errors",
               ExecuteJavascript("getAnyTestFailures()", tab_contents));
   }
 
   // The peer connection server lets our two tabs find each other and talk to
@@ skipping 91 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
   EXPECT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   content::WebContents* left_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  GetUserMedia(left_tab);
+  GetUserMediaAndAccept(left_tab);
 
   chrome::AddBlankTabAt(browser(), -1, true);
   content::WebContents* right_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(
         browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
-  GetUserMedia(right_tab);
+  GetUserMediaAndAccept(right_tab);
 
   ConnectToPeerConnectionServer("peer 1", left_tab);
   ConnectToPeerConnectionServer("peer 2", right_tab);
 
   EstablishCall(left_tab, right_tab);
 
   AssertNoAsynchronousErrors(left_tab);
   AssertNoAsynchronousErrors(right_tab);
 
   StartDetectingVideo(left_tab, "remote-view");
@@ skipping 11 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
                        MANUAL_TestMediaStreamTrackEnableDisable) {
   EXPECT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   content::WebContents* left_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  GetUserMedia(left_tab);
+  GetUserMediaAndAccept(left_tab);
 
   chrome::AddBlankTabAt(browser(), -1, true);
   content::WebContents* right_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(
         browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
-  GetUserMedia(right_tab);
+  GetUserMediaAndAccept(right_tab);
 
   ConnectToPeerConnectionServer("peer 1", left_tab);
   ConnectToPeerConnectionServer("peer 2", right_tab);
 
   EstablishCall(left_tab, right_tab);
 
   AssertNoAsynchronousErrors(left_tab);
   AssertNoAsynchronousErrors(right_tab);
 
   StartDetectingVideo(left_tab, "remote-view");
@@ skipping 60 matching lines @@
   command_line->AppendSwitch(switches::kEnableMetricsReportingForTesting);
 
   // Tell the uploader to save the multipart to a buffer instead of uploading.
   std::string multipart;
   g_browser_process->webrtc_log_uploader()->
       OverrideUploadWithBufferForTesting(&multipart);
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   content::WebContents* left_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-  GetUserMedia(left_tab);
+  GetUserMediaAndAccept(left_tab);
 
   chrome::AddBlankTabAt(browser(), -1, true);
   content::WebContents* right_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
-  GetUserMedia(right_tab);
+  GetUserMediaAndAccept(right_tab);
 
   ConnectToPeerConnectionServer("peer 1", left_tab);
   ConnectToPeerConnectionServer("peer 2", right_tab);
 
   EstablishCall(left_tab, right_tab, true);
 
   AssertNoAsynchronousErrors(left_tab);
   AssertNoAsynchronousErrors(right_tab);
 
   StartDetectingVideo(left_tab, "remote-view");
@@ skipping 92 matching lines @@
                multipart_lines[25].c_str());
   EXPECT_STREQ("Content-Type: application/gzip",
                multipart_lines[26].c_str());
   EXPECT_TRUE(multipart_lines[27].empty());
   EXPECT_TRUE(multipart_lines[28].empty());  // The removed zip part.
   std::string final_delimiter = boundary;
   final_delimiter += "--";
   EXPECT_STREQ(final_delimiter.c_str(), multipart_lines[29].c_str());
   EXPECT_TRUE(multipart_lines[30].empty());
 }