| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 parameters->Append(std::move(request_info)); | 100 parameters->Append(std::move(request_info)); |
| 101 parameters->AppendString(tab->GetURL().GetOrigin().spec()); | 101 parameters->AppendString(tab->GetURL().GetOrigin().spec()); |
| 102 } | 102 } |
| 103 | 103 |
| 104 private: | 104 private: |
| 105 scoped_refptr<extensions::Extension> extension_; | 105 scoped_refptr<extensions::Extension> extension_; |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace | 108 } // namespace |
| 109 | 109 |
| 110 IN_PROC_BROWSER_TEST_F(WebrtcEventLogApiTest, TestStartStopWebRtcEventLogging) { | 110 // TODO(ivoc): Reenable when the event log functionality in Chrome is updated. |
| 111 IN_PROC_BROWSER_TEST_F(WebrtcEventLogApiTest, |
| 112 DISABLED_TestStartStopWebRtcEventLogging) { |
| 111 ASSERT_TRUE(embedded_test_server()->Start()); | 113 ASSERT_TRUE(embedded_test_server()->Start()); |
| 112 | 114 |
| 113 content::WebContents* left_tab = | 115 content::WebContents* left_tab = |
| 114 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 116 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 115 content::WebContents* right_tab = | 117 content::WebContents* right_tab = |
| 116 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 118 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 117 | 119 |
| 118 SetupPeerconnectionWithLocalStream(left_tab); | 120 SetupPeerconnectionWithLocalStream(left_tab); |
| 119 SetupPeerconnectionWithLocalStream(right_tab); | 121 SetupPeerconnectionWithLocalStream(right_tab); |
| 120 | 122 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); | 193 base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); |
| 192 } | 194 } |
| 193 ASSERT_TRUE(base::PathExists(full_file_name)); | 195 ASSERT_TRUE(base::PathExists(full_file_name)); |
| 194 EXPECT_TRUE(base::GetFileSize(full_file_name, &file_size)); | 196 EXPECT_TRUE(base::GetFileSize(full_file_name, &file_size)); |
| 195 EXPECT_GT(file_size, 0); | 197 EXPECT_GT(file_size, 0); |
| 196 | 198 |
| 197 // Clean up. | 199 // Clean up. |
| 198 base::DeleteFile(full_file_name, false); | 200 base::DeleteFile(full_file_name, false); |
| 199 } | 201 } |
| 200 | 202 |
| 203 // TODO(ivoc): Reenable when the event log functionality in Chrome is updated. |
| 201 IN_PROC_BROWSER_TEST_F(WebrtcEventLogApiTest, | 204 IN_PROC_BROWSER_TEST_F(WebrtcEventLogApiTest, |
| 202 TestStartTimedWebRtcEventLogging) { | 205 DISABLED_TestStartTimedWebRtcEventLogging) { |
| 203 ASSERT_TRUE(embedded_test_server()->Start()); | 206 ASSERT_TRUE(embedded_test_server()->Start()); |
| 204 | 207 |
| 205 content::WebContents* left_tab = | 208 content::WebContents* left_tab = |
| 206 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 209 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 207 content::WebContents* right_tab = | 210 content::WebContents* right_tab = |
| 208 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 211 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 209 | 212 |
| 210 SetupPeerconnectionWithLocalStream(left_tab); | 213 SetupPeerconnectionWithLocalStream(left_tab); |
| 211 SetupPeerconnectionWithLocalStream(right_tab); | 214 SetupPeerconnectionWithLocalStream(right_tab); |
| 212 | 215 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 VLOG(1) << "Waiting for logfile to become available..."; | 266 VLOG(1) << "Waiting for logfile to become available..."; |
| 264 base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); | 267 base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); |
| 265 } | 268 } |
| 266 ASSERT_TRUE(base::PathExists(full_file_name)); | 269 ASSERT_TRUE(base::PathExists(full_file_name)); |
| 267 EXPECT_TRUE(base::GetFileSize(full_file_name, &file_size)); | 270 EXPECT_TRUE(base::GetFileSize(full_file_name, &file_size)); |
| 268 EXPECT_GT(file_size, 0); | 271 EXPECT_GT(file_size, 0); |
| 269 | 272 |
| 270 // Clean up. | 273 // Clean up. |
| 271 base::DeleteFile(full_file_name, false); | 274 base::DeleteFile(full_file_name, false); |
| 272 } | 275 } |
| OLD | NEW |