| Index: content/browser/trace_controller.cc
|
| diff --git a/content/browser/trace_controller.cc b/content/browser/trace_controller.cc
|
| index c7e570dce69e8eb4a8fec77421bade1aa5fa2819..e68b4fafc511c1ef4efdba4e34835797dc823c7b 100644
|
| --- a/content/browser/trace_controller.cc
|
| +++ b/content/browser/trace_controller.cc
|
| @@ -20,7 +20,7 @@ using content::BrowserThread;
|
|
|
| namespace {
|
|
|
| -class AutoStopTraceSubscriberStdio : public TraceSubscriberStdio {
|
| +class AutoStopTraceSubscriberStdio : public content::TraceSubscriberStdio {
|
| public:
|
| AutoStopTraceSubscriberStdio(const FilePath& file_path)
|
| : TraceSubscriberStdio(file_path) {}
|
| @@ -86,10 +86,6 @@ void TraceController::InitStartupTracing(const CommandLine& command_line) {
|
| scoped_ptr<AutoStopTraceSubscriberStdio> subscriber(
|
| new AutoStopTraceSubscriberStdio(trace_file));
|
| DCHECK(can_begin_tracing(subscriber.get()));
|
| - if (!subscriber->IsValid()) {
|
| - TraceLog::GetInstance()->SetDisabled();
|
| - return;
|
| - }
|
|
|
| std::string delay_str = command_line.GetSwitchValueASCII(
|
| switches::kTraceStartupDuration);
|
| @@ -314,7 +310,7 @@ void TraceController::OnEndTracingAck(
|
| }
|
|
|
| void TraceController::OnTraceDataCollected(
|
| - const scoped_refptr<TraceLog::RefCountedString>& events_str_ptr) {
|
| + const scoped_refptr<base::RefCountedString>& events_str_ptr) {
|
| // OnTraceDataCollected may be called from any browser thread, either by the
|
| // local event trace system or from child processes via TraceMessageFilter.
|
| if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
|
| @@ -326,7 +322,7 @@ void TraceController::OnTraceDataCollected(
|
|
|
| // Drop trace events if we are just getting categories.
|
| if (subscriber_ && !is_get_categories_)
|
| - subscriber_->OnTraceDataCollected(events_str_ptr->data);
|
| + subscriber_->OnTraceDataCollected(events_str_ptr);
|
| }
|
|
|
| void TraceController::OnTraceBufferFull() {
|
|
|