chromium/src
0
Fork 0
Code Activity

Revert "Add flag to log webrtc trace events to a file."

Browse Source 
This reverts commit 60f3dc1fde.

Reason for revert: Not compiling on win-chrome

First failure: 
https://ci.chromium.org/ui/p/chrome/builders/ci/win-chrome/25455/overview

Original change's description:
> Add flag to log webrtc trace events to a file.
>
> BUG=b/202511979
>
> Change-Id: I5ee5150c12e49284f8af705a72bbb48e361c4de1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3399049
> Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
> Commit-Queue: Nicolas "an integer in chubby" Avrutin <rasputin@google.com>
> Cr-Commit-Position: refs/heads/main@{#961126}

Bug: b/202511979
Change-Id: Ib5f8002852622fbc7bff0a416ae685259c7e0cbd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3403039
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Owners-Override: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/main@{#961150}
This commit is contained in:
Leonard Grey
2022-01-19 21:59:02 +00:00
committed by Chromium LUCI CQ
parent 8b1f8f30ff
commit bf4ddd0e12
2 changed files with 4 additions and 18 deletions

4
remoting/host/host_main.cc

@ -79,9 +79,7 @@ const char kUsageMessage[] =
" --help, -? - Prints this message.\n"
" --type - Specifies process type.\n"
" --version - Prints the host version and exits.\n"
" --evaluate-type=<type> - Evaluates the capability of the host.\n"
" --webrtc-trace-event-file=<path> - Enables logging webrtc trace events "
"to a file.";
" --evaluate-type=<type> - Evaluates the capability of the host.\n";
void Usage(const base::FilePath& program_name) {
printf(kUsageMessage, program_name.MaybeAsASCII().c_str());

18
remoting/host/remoting_me2me_host.cc

@ -104,7 +104,7 @@
#include "remoting/signaling/remoting_log_to_server.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/webrtc/rtc_base/event_tracer.h"
#include "third_party/webrtc/api/scoped_refptr.h"
#if BUILDFLAG(IS_POSIX)
#include <signal.h>
@ -205,10 +205,6 @@ const char kHostOfflineReasonZombieStateDetected[] = "ZOMBIE_STATE_DETECTED";
// email address is Google-internal or not.
constexpr char kGooglerEmailDomain[] = "@google.com";
// File to write webrtc trace events to. If not specified, webrtc trace events
// will not be enabled.
const char kWebRtcTraceEventFile[] = "webrtc-trace-event-file";
} // namespace
namespace remoting {
@ -1885,14 +1881,14 @@ void HostProcess::CrashHostProcess(const std::string& function_name,
int HostProcessMain() {
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
// use X11 safely (such as the WebRTC capturer, GTK ...)
x11::InitXlib();
if (!cmd_line->HasSwitch(kReportOfflineReasonSwitchName)) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
kReportOfflineReasonSwitchName)) {
// Required for any calls into GTK functions, such as the Disconnect and
// Continue windows, though these should not be used for the Me2Me case
// (crbug.com/104377).
@ -1908,12 +1904,6 @@ int HostProcessMain() {
base::GetLinuxDistro();
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
if (cmd_line->HasSwitch(kWebRtcTraceEventFile)) {
rtc::tracing::SetupInternalTracer();
rtc::tracing::StartInternalCapture(
cmd_line->GetSwitchValuePath(kWebRtcTraceEventFile).value().c_str());
}
base::ThreadPoolInstance::CreateAndStartWithDefaultParams("Me2Me");
// Create the main task executor and start helper threads.
@ -1952,8 +1942,6 @@ int HostProcessMain() {
// Block until tasks blocking shutdown have completed their execution.
base::ThreadPoolInstance::Get()->Shutdown();
rtc::tracing::ShutdownInternalTracer();
return exit_code;
}