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

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

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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
« no previous file with comments | « chrome/browser/media/webrtc_video_quality_browsertest.cc ('k') | chrome/browser/media/window_icon_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/webrtc_webcam_browsertest.cc
diff --git a/chrome/browser/media/webrtc_webcam_browsertest.cc b/chrome/browser/media/webrtc_webcam_browsertest.cc
deleted file mode 100644
index 9fe32a470b6c69234492896cccb94538f8fd579c..0000000000000000000000000000000000000000
--- a/chrome/browser/media/webrtc_webcam_browsertest.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 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 "build/build_config.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/common/chrome_switches.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/test/browser_test_utils.h"
-#include "media/base/media_switches.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "testing/gtest/include/gtest/gtest-param-test.h"
-
-static const char kMainWebrtcTestHtmlPage[] =
- "/webrtc/webrtc_jsep01_test.html";
-
-static const char* kTestConfigFlags[] = {
-#if defined(OS_WIN)
- NULL,
- // Media Foundation is only available in Windows versions >= 7, below that the
- // following flag has no effect; the test would run twice using DirectShow.
- switches::kForceMediaFoundationVideoCapture
-#else
- NULL
-#endif
-};
-
-// These tests runs on real webcams and ensure WebRTC can acquire webcams
-// correctly. They will do nothing if there are no webcams on the system.
-// The webcam on the system must support up to 1080p, or the test will fail.
-// This test is excellent for testing the various capture paths of WebRTC
-// on all desktop platforms.
-class WebRtcWebcamBrowserTest : public WebRtcTestBase,
- public testing::WithParamInterface<const char*> {
- public:
- void SetUpCommandLine(base::CommandLine* command_line) override {
- EXPECT_FALSE(command_line->HasSwitch(
- switches::kUseFakeDeviceForMediaStream));
- EXPECT_FALSE(command_line->HasSwitch(
- switches::kUseFakeUIForMediaStream));
- if (GetParam())
- command_line->AppendSwitch(GetParam());
- }
-
- protected:
- void SetUpInProcessBrowserTestFixture() override {
- DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
- }
-
- std::string GetUserMediaAndGetStreamSize(content::WebContents* tab,
- const std::string& constraints) {
- std::string actual_stream_size;
- if (GetUserMediaWithSpecificConstraintsAndAcceptIfPrompted(tab,
- constraints)) {
- StartDetectingVideo(tab, "local-view");
- if (WaitForVideoToPlay(tab))
- actual_stream_size = GetStreamSize(tab, "local-view");
- CloseLastLocalStream(tab);
- }
- return actual_stream_size;
- }
-};
-
-// This test is manual because the test results can vary heavily depending on
-// which webcam or drivers you have on the system.
-IN_PROC_BROWSER_TEST_P(WebRtcWebcamBrowserTest,
- MANUAL_TestAcquiringAndReacquiringWebcam) {
- ASSERT_TRUE(embedded_test_server()->Start());
- GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
- ui_test_utils::NavigateToURL(browser(), url);
- content::WebContents* tab =
- browser()->tab_strip_model()->GetActiveWebContents();
-
- if (!HasWebcamAvailableOnSystem(tab)) {
- LOG(INFO) << "No webcam found on bot: skipping...";
- return;
- }
-
- EXPECT_EQ("320x240",
- GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsQVGA));
- EXPECT_EQ("640x480",
- GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsVGA));
- EXPECT_EQ("640x360",
- GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p));
- EXPECT_EQ("1280x720",
- GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));
- EXPECT_EQ("1920x1080",
- GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p));
-}
-
-INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests,
- WebRtcWebcamBrowserTest,
- testing::ValuesIn(kTestConfigFlags));
« no previous file with comments | « chrome/browser/media/webrtc_video_quality_browsertest.cc ('k') | chrome/browser/media/window_icon_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698