Clean up public TracingController interface [1/3]: hide TraceDataEndpoint

content/browser/tracing/tracing_controller_impl_data_sinks.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/strings/pattern.h"
 #include "content/browser/tracing/tracing_controller_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/zlib/zlib.h"
 
 namespace content {
 
 namespace {
 
 const char kChromeTraceLabel[] = "traceEvents";
 const char kMetadataTraceLabel[] = "metadata";
 
-class StringTraceDataEndpoint : public TracingController::TraceDataEndpoint {
+class StringTraceDataEndpoint : public TraceDataEndpoint {
  public:
   typedef base::Callback<void(std::unique_ptr<const base::DictionaryValue>,
                               base::RefCountedString*)>
       CompletionCallback;
 
   explicit StringTraceDataEndpoint(CompletionCallback callback)
       : completion_callback_(callback) {}
 
   void ReceiveTraceFinalContents(
       std::unique_ptr<const base::DictionaryValue> metadata,
       const std::string& contents) override {
     std::string tmp = contents;
     scoped_refptr<base::RefCountedString> str =
         base::RefCountedString::TakeString(&tmp);
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(completion_callback_, base::Passed(std::move(metadata)),
                    base::RetainedRef(str)));
   }
 
  private:
   ~StringTraceDataEndpoint() override {}
 
   CompletionCallback completion_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(StringTraceDataEndpoint);
 };
 
-class FileTraceDataEndpoint : public TracingController::TraceDataEndpoint {
+class FileTraceDataEndpoint : public TraceDataEndpoint {
  public:
   explicit FileTraceDataEndpoint(const base::FilePath& trace_file_path,
                                  const base::Closure& callback)
       : file_path_(trace_file_path),
         completion_callback_(callback),
         file_(NULL) {}
 
   void ReceiveTraceChunk(const std::string& chunk) override {
     std::string tmp = chunk;
     scoped_refptr<base::RefCountedString> chunk_ptr =
@@ skipping 47 matching lines @@
 
   base::FilePath file_path_;
   base::Closure completion_callback_;
   FILE* file_;
 
   DISALLOW_COPY_AND_ASSIGN(FileTraceDataEndpoint);
 };
 
 class StringTraceDataSink : public TracingController::TraceDataSink {
  public:
-  explicit StringTraceDataSink(
-      scoped_refptr<TracingController::TraceDataEndpoint> endpoint)
+  explicit StringTraceDataSink(scoped_refptr<TraceDataEndpoint> endpoint)
       : endpoint_(endpoint) {}
 
   void AddTraceChunk(const std::string& chunk) override {
     std::string trace_string;
     if (trace_.empty())
       trace_string = "{\"" + std::string(kChromeTraceLabel) + "\":[";
     else
       trace_string = ",";
     trace_string += chunk;
 
@@ skipping 20 matching lines @@
     }
 
     AddTraceChunkAndPassToEndpoint("}");
 
     endpoint_->ReceiveTraceFinalContents(GetMetadataCopy(), trace_);
   }
 
  private:
   ~StringTraceDataSink() override {}
 
-  scoped_refptr<TracingController::TraceDataEndpoint> endpoint_;
+  scoped_refptr<TraceDataEndpoint> endpoint_;
   std::string trace_;
 
   DISALLOW_COPY_AND_ASSIGN(StringTraceDataSink);
 };
 
 class CompressedStringTraceDataSink : public TracingController::TraceDataSink {
  public:
   explicit CompressedStringTraceDataSink(
-      scoped_refptr<TracingController::TraceDataEndpoint> endpoint)
+      scoped_refptr<TraceDataEndpoint> endpoint)
       : endpoint_(endpoint), already_tried_open_(false) {}
 
   void AddTraceChunk(const std::string& chunk) override {
     std::string tmp = chunk;
     scoped_refptr<base::RefCountedString> chunk_ptr =
         base::RefCountedString::TakeString(&tmp);
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&CompressedStringTraceDataSink::AddTraceChunkOnFileThread,
                    this, chunk_ptr));
@@ skipping 98 matching lines @@
     }
     AddTraceChunkAndCompressOnFileThread("}", true);
 
     deflateEnd(stream_.get());
     stream_.reset();
 
     endpoint_->ReceiveTraceFinalContents(GetMetadataCopy(),
                                          compressed_trace_data_);
   }
 
-  scoped_refptr<TracingController::TraceDataEndpoint> endpoint_;
+  scoped_refptr<TraceDataEndpoint> endpoint_;
   std::unique_ptr<z_stream> stream_;
   bool already_tried_open_;
   std::string compressed_trace_data_;
 
   DISALLOW_COPY_AND_ASSIGN(CompressedStringTraceDataSink);
 };
 
 }  // namespace
 
 TracingController::TraceDataSink::TraceDataSink() {}
@@ skipping 41 matching lines @@
 }
 
 scoped_refptr<TracingController::TraceDataSink>
 TracingController::CreateStringSink(
     const base::Callback<void(std::unique_ptr<const base::DictionaryValue>,
                               base::RefCountedString*)>& callback) {
   return new StringTraceDataSink(new StringTraceDataEndpoint(callback));
 }
 
 scoped_refptr<TracingController::TraceDataSink>
-TracingController::CreateCompressedStringSink(
-    scoped_refptr<TracingController::TraceDataEndpoint> endpoint) {
+TracingControllerImpl::CreateCompressedStringSink(
+    scoped_refptr<TraceDataEndpoint> endpoint) {
   return new CompressedStringTraceDataSink(endpoint);
 }
 
 scoped_refptr<TracingController::TraceDataSink>
 TracingController::CreateFileSink(const base::FilePath& file_path,
                                   const base::Closure& callback) {
   return new StringTraceDataSink(
-      CreateFileEndpoint(file_path, callback));
+      TracingControllerImpl::CreateFileEndpoint(file_path, callback));
 }
 
-scoped_refptr<TracingController::TraceDataEndpoint>
-TracingController::CreateCallbackEndpoint(
+scoped_refptr<TraceDataEndpoint> TracingControllerImpl::CreateCallbackEndpoint(
     const base::Callback<void(std::unique_ptr<const base::DictionaryValue>,
                               base::RefCountedString*)>& callback) {
   return new StringTraceDataEndpoint(callback);
 }
 
-scoped_refptr<TracingController::TraceDataEndpoint>
-TracingController::CreateFileEndpoint(const base::FilePath& file_path,
-                                      const base::Closure& callback) {
+scoped_refptr<TraceDataEndpoint> TracingControllerImpl::CreateFileEndpoint(
+    const base::FilePath& file_path,
+    const base::Closure& callback) {
   return new FileTraceDataEndpoint(file_path, callback);
 }
 
 }  // namespace content