Chromium Code Reviews| Index: content/browser/tracing/tracing_controller_impl.cc |
| diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc |
| index 70edf234be4be8849a0883912a32216293d48130..9c4e43d30e62a51e39e8a36a0f4219a75e376d56 100644 |
| --- a/content/browser/tracing/tracing_controller_impl.cc |
| +++ b/content/browser/tracing/tracing_controller_impl.cc |
| @@ -50,7 +50,7 @@ const char kChromeTracingAgentName[] = "chrome"; |
| const char kETWTracingAgentName[] = "etw"; |
| const char kChromeTraceLabel[] = "traceEvents"; |
| -const int kIssueClockSyncTimeout = 30; |
| +const int kIssueClockSyncTimeoutSeconds = 30; |
| std::string GetNetworkTypeString() { |
| switch (net::NetworkChangeNotifier::GetConnectionType()) { |
| @@ -968,10 +968,8 @@ void TracingControllerImpl::IssueClockSyncMarker() { |
| StopTracingAfterClockSync(); |
| } else { |
| clock_sync_timer_.Start( |
| - FROM_HERE, |
| - base::TimeDelta::FromSeconds(kIssueClockSyncTimeout), |
| - this, |
| - &TracingControllerImpl::StopTracingAfterClockSync); |
| + FROM_HERE, base::TimeDelta::FromSeconds(kIssueClockSyncTimeoutSeconds), |
|
charliea (OOO until 10-5)
2016/01/26 14:47:20
(I also ran git cl format, which caused the format
|
| + this, &TracingControllerImpl::StopTracingAfterClockSync); |
| } |
| } |