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

Unified Diff: chrome/browser/media/webrtc_disable_encryption_flag_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_browsertest_perf.cc ('k') | chrome/browser/media/webrtc_event_log_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/webrtc_disable_encryption_flag_browsertest.cc
diff --git a/chrome/browser/media/webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/webrtc_disable_encryption_flag_browsertest.cc
deleted file mode 100644
index f857d3bf5b418b23f5dee0f84198ecea69046cdb..0000000000000000000000000000000000000000
--- a/chrome/browser/media/webrtc_disable_encryption_flag_browsertest.cc
+++ /dev/null
@@ -1,92 +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 "base/macros.h"
-#include "build/build_config.h"
-#include "chrome/browser/media/webrtc_browsertest_base.h"
-#include "chrome/browser/media/webrtc_browsertest_common.h"
-#include "chrome/common/channel_info.h"
-#include "components/version_info/version_info.h"
-#include "content/public/common/content_switches.h"
-#include "media/base/media_switches.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-
-static const char kMainWebrtcTestHtmlPage[] =
- "/webrtc/webrtc_jsep01_test.html";
-
-// This tests the --disable-webrtc-encryption command line flag. Disabling
-// encryption should only be possible on certain channels.
-
-// NOTE: The test case for each channel will only be exercised when the browser
-// is actually built for that channel. This is not ideal. One can test manually
-// by e.g. faking the channel returned in chrome::GetChannel(). It's likely good
-// to have the test anyway, even though a failure might not be detected until a
-// branch has been promoted to another channel. The unit test for
-// ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch tests for
-// all channels however.
-// TODO(grunell): Test the different channel cases for any build.
-class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
- public:
- WebRtcDisableEncryptionFlagBrowserTest() {}
- ~WebRtcDisableEncryptionFlagBrowserTest() override {}
-
- void SetUpInProcessBrowserTestFixture() override {
- DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
- }
-
- void SetUpCommandLine(base::CommandLine* command_line) override {
- // This test should run with fake devices.
- command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
-
- // Disable encryption with the command line flag.
- command_line->AppendSwitch(switches::kDisableWebRtcEncryption);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebRtcDisableEncryptionFlagBrowserTest);
-};
-
-// Makes a call and checks that there's encryption or not in the SDP offer.
-IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest,
- VerifyEncryption) {
- ASSERT_TRUE(embedded_test_server()->Start());
-
- content::WebContents* left_tab =
- OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
- content::WebContents* right_tab =
- OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
-
- SetupPeerconnectionWithLocalStream(left_tab);
- SetupPeerconnectionWithLocalStream(right_tab);
-
- NegotiateCall(left_tab, right_tab);
-
- StartDetectingVideo(left_tab, "remote-view");
- StartDetectingVideo(right_tab, "remote-view");
-
- WaitForVideoToPlay(left_tab);
- WaitForVideoToPlay(right_tab);
-
- bool should_detect_encryption = true;
- version_info::Channel channel = chrome::GetChannel();
- if (channel == version_info::Channel::UNKNOWN ||
- channel == version_info::Channel::CANARY ||
- channel == version_info::Channel::DEV) {
- should_detect_encryption = false;
- }
-#if defined(OS_ANDROID)
- if (channel == version_info::Channel::BETA)
- should_detect_encryption = false;
-#endif
-
- std::string expected_string = should_detect_encryption ?
- "crypto-seen" : "no-crypto-seen";
-
- ASSERT_EQ(expected_string,
- ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));
-
- HangUp(left_tab);
- HangUp(right_tab);
-}
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_perf.cc ('k') | chrome/browser/media/webrtc_event_log_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698