| 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 2362a1576377fec91a58f90a3beaf50315ef0cce..06826c4fe1c4290ef36ac5ca48037781f19b6ed6 100644
|
| --- a/content/browser/tracing/tracing_controller_impl.cc
|
| +++ b/content/browser/tracing/tracing_controller_impl.cc
|
| @@ -43,7 +43,7 @@ class FileTraceDataSink : public TracingController::TraceDataSink {
|
| completion_callback_(callback),
|
| file_(NULL) {}
|
|
|
| - virtual void AddTraceChunk(const std::string& chunk) OVERRIDE {
|
| + virtual void AddTraceChunk(const std::string& chunk) override {
|
| std::string tmp = chunk;
|
| scoped_refptr<base::RefCountedString> chunk_ptr =
|
| base::RefCountedString::TakeString(&tmp);
|
| @@ -53,10 +53,10 @@ class FileTraceDataSink : public TracingController::TraceDataSink {
|
| base::Bind(
|
| &FileTraceDataSink::AddTraceChunkOnFileThread, this, chunk_ptr));
|
| }
|
| - virtual void SetSystemTrace(const std::string& data) OVERRIDE {
|
| + virtual void SetSystemTrace(const std::string& data) override {
|
| system_trace_ = data;
|
| }
|
| - virtual void Close() OVERRIDE {
|
| + virtual void Close() override {
|
| BrowserThread::PostTask(
|
| BrowserThread::FILE,
|
| FROM_HERE,
|
| @@ -127,15 +127,15 @@ class StringTraceDataSink : public TracingController::TraceDataSink {
|
| : completion_callback_(callback) {}
|
|
|
| // TracingController::TraceDataSink implementation
|
| - virtual void AddTraceChunk(const std::string& chunk) OVERRIDE {
|
| + virtual void AddTraceChunk(const std::string& chunk) override {
|
| if (!trace_.empty())
|
| trace_ += ",";
|
| trace_ += chunk;
|
| }
|
| - virtual void SetSystemTrace(const std::string& data) OVERRIDE {
|
| + virtual void SetSystemTrace(const std::string& data) override {
|
| system_trace_ = data;
|
| }
|
| - virtual void Close() OVERRIDE {
|
| + virtual void Close() override {
|
| std::string result = "{\"traceEvents\":[" + trace_ + "]";
|
| if (!system_trace_.empty())
|
| result += ",\"systemTraceEvents\": " + system_trace_;
|
|
|