| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/base/tracing.h" | 5 #include "chrome/test/base/tracing.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/macros.h" |
| 9 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| 10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 12 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
| 13 #include "base/trace_event/trace_event.h" | 14 #include "base/trace_event/trace_event.h" |
| 14 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/browser/tracing_controller.h" | 16 #include "content/public/browser/tracing_controller.h" |
| 16 #include "content/public/test/test_utils.h" | 17 #include "content/public/test/test_utils.h" |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 bool WaitForWatchEvent(base::TimeDelta timeout) { | 180 bool WaitForWatchEvent(base::TimeDelta timeout) { |
| 180 return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout); | 181 return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout); |
| 181 } | 182 } |
| 182 | 183 |
| 183 bool EndTracing(std::string* json_trace_output) { | 184 bool EndTracing(std::string* json_trace_output) { |
| 184 return InProcessTraceController::GetInstance()->EndTracing(json_trace_output); | 185 return InProcessTraceController::GetInstance()->EndTracing(json_trace_output); |
| 185 } | 186 } |
| 186 | 187 |
| 187 } // namespace tracing | 188 } // namespace tracing |
| 188 | 189 |
| OLD | NEW |