Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1796)

Unified Diff: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

Issue 1161153003: Convert the WebRtcTestBase to use infobar and bubble autoresponders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix MANUAL test Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
index dbd7883ecaf4bda24c1b02a56841434d63e5d66c..102801c6164d844ea79b8c8d1d39a5df0eeab633 100644
--- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
@@ -9,11 +9,14 @@
#include "base/rand_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/infobars/infobar_responder.h"
+#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/media/webrtc_browsertest_base.h"
#include "chrome/browser/media/webrtc_browsertest_common.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/browser/ui/website_settings/permission_bubble_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test_utils.h"
@@ -246,11 +249,25 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
GURL room_url = GURL("http://localhost:9999/r/some_room"
"?wshpp=localhost:8089&wstls=false");
+ // Set up the left tab.
chrome::AddTabAt(browser(), GURL(), -1, true);
- content::WebContents* left_tab = OpenPageAndAcceptUserMedia(room_url);
-
+ content::WebContents* left_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ PermissionBubbleManager::FromWebContents(left_tab)
+ ->set_auto_response_for_test(PermissionBubbleManager::ACCEPT_ALL);
+ InfoBarResponder left_infobar_responder(
+ InfoBarService::FromWebContents(left_tab), InfoBarResponder::ACCEPT);
+ ui_test_utils::NavigateToURL(browser(), room_url);
+
+ // Set up the right tab.
chrome::AddTabAt(browser(), GURL(), -1, true);
- content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url);
+ content::WebContents* right_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ PermissionBubbleManager::FromWebContents(right_tab)
+ ->set_auto_response_for_test(PermissionBubbleManager::ACCEPT_ALL);
+ InfoBarResponder right_infobar_responder(
+ InfoBarService::FromWebContents(right_tab), InfoBarResponder::ACCEPT);
+ ui_test_utils::NavigateToURL(browser(), room_url);
ASSERT_TRUE(WaitForCallToComeUp(left_tab));
ASSERT_TRUE(WaitForCallToComeUp(right_tab));
@@ -284,7 +301,14 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
GURL room_url = GURL("http://localhost:9999/r/some_room"
"?wshpp=localhost:8089&wstls=false"
"&firefox_fake_device=1");
- content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
+ chrome::AddTabAt(browser(), GURL(), -1, true);
+ content::WebContents* chrome_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ PermissionBubbleManager::FromWebContents(chrome_tab)
+ ->set_auto_response_for_test(PermissionBubbleManager::ACCEPT_ALL);
+ InfoBarResponder infobar_responder(
+ InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT);
+ ui_test_utils::NavigateToURL(browser(), room_url);
ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
« no previous file with comments | « chrome/browser/media/chrome_media_stream_infobar_browsertest.cc ('k') | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698