Commit 2e196caf authored by Max Morin's avatar Max Morin Committed by Commit Bot

Reenable WebRtcInternalsMessageHandlerTest.

It was accidentally disabled in
https://codereview.chromium.org/2176753003.

Bug: 783818
Change-Id: I52f53bd0130737486e97989643421f9dc93df749
Reviewed-on: https://chromium-review.googlesource.com/997352Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Commit-Queue: Max Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548382}
parent 2e0cad38
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "content/browser/webrtc/webrtc_internals.h" #include "content/browser/webrtc/webrtc_internals.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "content/public/test/navigation_simulator.h"
#include "content/public/test/test_web_ui.h" #include "content/public/test/test_web_ui.h"
#include "content/test/test_web_contents.h" #include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -77,7 +78,9 @@ TEST_F(WebRtcInternalsMessageHandlerTest, DontRunJSBeforeNavigationCommitted) { ...@@ -77,7 +78,9 @@ TEST_F(WebRtcInternalsMessageHandlerTest, DontRunJSBeforeNavigationCommitted) {
kConstraints); kConstraints);
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
static_cast<TestWebContents*>(web_contents())->StartNavigation(webrtc_url); auto navigation = content::NavigationSimulator::CreateBrowserInitiated(
webrtc_url, web_contents());
navigation->Start();
// We still shouldn't run JS, since navigation to webrtc-internals isn't // We still shouldn't run JS, since navigation to webrtc-internals isn't
// finished. // finished.
webrtc_internals.OnRemovePeerConnection(1, 2); webrtc_internals.OnRemovePeerConnection(1, 2);
......
...@@ -1815,6 +1815,7 @@ test("content_unittests") { ...@@ -1815,6 +1815,7 @@ test("content_unittests") {
"../browser/renderer_host/p2p/socket_host_test_utils.cc", "../browser/renderer_host/p2p/socket_host_test_utils.cc",
"../browser/renderer_host/p2p/socket_host_test_utils.h", "../browser/renderer_host/p2p/socket_host_test_utils.h",
"../browser/renderer_host/p2p/socket_host_udp_unittest.cc", "../browser/renderer_host/p2p/socket_host_udp_unittest.cc",
"../browser/webrtc/webrtc_internals_message_handler_unittest.cc",
"../browser/webrtc/webrtc_internals_unittest.cc", "../browser/webrtc/webrtc_internals_unittest.cc",
"../renderer/media/stream/media_stream_audio_processor_unittest.cc", "../renderer/media/stream/media_stream_audio_processor_unittest.cc",
"../renderer/media/stream/media_stream_audio_unittest.cc", "../renderer/media/stream/media_stream_audio_unittest.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment