| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/webrtc_browsertest_base.h" | 5 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "chrome/browser/media/webrtc_browsertest_common.h" | 14 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" |
| 15 #include "chrome/browser/permissions/permission_request_manager.h" | 15 #include "chrome/browser/permissions/permission_request_manager.h" |
| 16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
| 17 #include "chrome/browser/ui/browser_tabstrip.h" | 17 #include "chrome/browser/ui/browser_tabstrip.h" |
| 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 19 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
| 20 #include "content/public/test/browser_test_utils.h" | 20 #include "content/public/test/browser_test_utils.h" |
| 21 #include "net/test/embedded_test_server/embedded_test_server.h" | 21 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 22 | 22 |
| 23 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
| 24 // For fine-grained suppression. | 24 // For fine-grained suppression. |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 void WebRtcTestBase::SetDefaultVideoCodec( | 469 void WebRtcTestBase::SetDefaultVideoCodec( |
| 470 content::WebContents* tab, | 470 content::WebContents* tab, |
| 471 const std::string& video_codec) const { | 471 const std::string& video_codec) const { |
| 472 EXPECT_EQ("ok-forced", | 472 EXPECT_EQ("ok-forced", |
| 473 ExecuteJavascript("forceVideoCodec('" + video_codec + "')", tab)); | 473 ExecuteJavascript("forceVideoCodec('" + video_codec + "')", tab)); |
| 474 } | 474 } |
| 475 | 475 |
| 476 void WebRtcTestBase::EnableOpusDtx(content::WebContents* tab) const { | 476 void WebRtcTestBase::EnableOpusDtx(content::WebContents* tab) const { |
| 477 EXPECT_EQ("ok-forced", ExecuteJavascript("forceOpusDtx()", tab)); | 477 EXPECT_EQ("ok-forced", ExecuteJavascript("forceOpusDtx()", tab)); |
| 478 } | 478 } |
| OLD | NEW |