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

Unified Diff: chrome/browser/media/media_stream_infobar_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
Index: chrome/browser/media/media_stream_infobar_browsertest.cc
diff --git a/chrome/browser/media/media_stream_infobar_browsertest.cc b/chrome/browser/media/media_stream_infobar_browsertest.cc
deleted file mode 100644
index 51c722827367469ac4b6155ef5cb392fd5349f07..0000000000000000000000000000000000000000
--- a/chrome/browser/media/media_stream_infobar_browsertest.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-// 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/files/file_util.h"
-#include "base/macros.h"
-#include "base/strings/stringprintf.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/media/media_stream_devices_controller.h"
-#include "chrome/browser/media/webrtc_browsertest_base.h"
-#include "chrome/browser/media/webrtc_browsertest_common.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/test_switches.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/content_settings/core/common/content_settings_types.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/common/media_stream_request.h"
-#include "content/public/common/origin_util.h"
-#include "content/public/test/browser_test_utils.h"
-#include "media/base/media_switches.h"
-#include "net/dns/mock_host_resolver.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-
-// MediaStreamPermissionTest ---------------------------------------------------
-
-class MediaStreamPermissionTest : public WebRtcTestBase {
- public:
- MediaStreamPermissionTest() {}
- ~MediaStreamPermissionTest() override {}
-
- // InProcessBrowserTest:
- void SetUpCommandLine(base::CommandLine* command_line) override {
- // This test expects to run with fake devices but real UI.
- command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
- EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream))
- << "Since this test tests the UI we want the real UI!";
- }
-
- protected:
- content::WebContents* LoadTestPageInTab() {
- return LoadTestPageInBrowser(browser());
- }
-
- content::WebContents* LoadTestPageInIncognitoTab() {
- return LoadTestPageInBrowser(CreateIncognitoBrowser());
- }
-
- // Returns the URL of the main test page.
- GURL test_page_url() const {
- const char kMainWebrtcTestHtmlPage[] = "/webrtc/webrtc_jsep01_test.html";
- return embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage);
- }
-
- private:
- content::WebContents* LoadTestPageInBrowser(Browser* browser) {
- EXPECT_TRUE(embedded_test_server()->Start());
-
- // Uses the default server.
- GURL url = test_page_url();
-
- EXPECT_TRUE(content::IsOriginSecure(url));
-
- ui_test_utils::NavigateToURL(browser, url);
- return browser->tab_strip_model()->GetActiveWebContents();
- }
-
- // Dummy callback for when we deny the current request directly.
- static void OnMediaStreamResponse(
- const content::MediaStreamDevices& devices,
- content::MediaStreamRequestResult result,
- std::unique_ptr<content::MediaStreamUI> ui) {}
-
- DISALLOW_COPY_AND_ASSIGN(MediaStreamPermissionTest);
-};
-
-// Actual tests ---------------------------------------------------------------
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestAllowingUserMedia) {
- content::WebContents* tab_contents = LoadTestPageInTab();
- EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDenyingUserMedia) {
- content::WebContents* tab_contents = LoadTestPageInTab();
- GetUserMediaAndDeny(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDismissingRequest) {
- content::WebContents* tab_contents = LoadTestPageInTab();
- GetUserMediaAndDismiss(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- TestDenyingUserMediaIncognito) {
- content::WebContents* tab_contents = LoadTestPageInIncognitoTab();
- GetUserMediaAndDeny(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- TestSecureOriginDenyIsSticky) {
- content::WebContents* tab_contents = LoadTestPageInTab();
- EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
-
- GetUserMediaAndDeny(tab_contents);
- GetUserMediaAndExpectAutoDenyWithoutPrompt(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- TestSecureOriginAcceptIsSticky) {
- content::WebContents* tab_contents = LoadTestPageInTab();
- EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
-
- EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
- GetUserMediaAndExpectAutoAcceptWithoutPrompt(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDismissIsNotSticky) {
- content::WebContents* tab_contents = LoadTestPageInTab();
-
- GetUserMediaAndDismiss(tab_contents);
- GetUserMediaAndDismiss(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- TestDenyingThenClearingStickyException) {
- content::WebContents* tab_contents = LoadTestPageInTab();
-
- GetUserMediaAndDeny(tab_contents);
- GetUserMediaAndExpectAutoDenyWithoutPrompt(tab_contents);
-
- HostContentSettingsMap* settings_map =
- HostContentSettingsMapFactory::GetForProfile(browser()->profile());
-
- settings_map->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
- settings_map->ClearSettingsForOneType(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
-
- GetUserMediaAndDeny(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- DenyingMicDoesNotCauseStickyDenyForCameras) {
- content::WebContents* tab_contents = LoadTestPageInTab();
-
- GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
- kAudioOnlyCallConstraints);
- EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
- tab_contents, kVideoOnlyCallConstraints));
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
- DenyingCameraDoesNotCauseStickyDenyForMics) {
- content::WebContents* tab_contents = LoadTestPageInTab();
-
- GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
- kVideoOnlyCallConstraints);
- EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
- tab_contents, kAudioOnlyCallConstraints));
-}

Powered by Google App Engine
This is Rietveld 408576698