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

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

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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_media_stream_infobar_browsertest.cc
diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
index cd785b4f8e7f294e5818bef455efb9ba2b49ed35..05f8033dfc38d827ddb5dee76a2aaeaa0086ce1c 100644
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
@@ -28,7 +28,7 @@
#include "content/public/test/browser_test_utils.h"
#include "media/base/media_switches.h"
#include "net/dns/mock_host_resolver.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
// MediaStreamPermissionTest ---------------------------------------------------
@@ -56,14 +56,13 @@ class MediaStreamPermissionTest : public WebRtcTestBase {
// Returns the URL of the main test page.
GURL test_page_url() const {
- const char kMainWebrtcTestHtmlPage[] =
- "files/webrtc/webrtc_jsep01_test.html";
- return test_server()->GetURL(kMainWebrtcTestHtmlPage);
+ const char kMainWebrtcTestHtmlPage[] = "/webrtc/webrtc_jsep01_test.html";
+ return embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage);
}
private:
content::WebContents* LoadTestPageInBrowser(Browser* browser) {
- EXPECT_TRUE(test_server()->Start());
+ EXPECT_TRUE(embedded_test_server()->Start());
// Uses the default server.
GURL url = test_page_url();

Powered by Google App Engine
This is Rietveld 408576698