Retract GrDrawTarget and GrPipelineBuilder a bit more

src/gpu/GrTracing.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTracing_DEFINED
 #define GrTracing_DEFINED
 
-#include "GrDrawTarget.h"
 #include "GrGpu.h"
 #include "GrTraceMarker.h"
 #include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
 /**
  * Marker generation class used for adding and removing markers around code blocks
  */
 class GrGpuTraceMarkerGenerator : public ::SkNoncopyable {
 public:
-    GrGpuTraceMarkerGenerator(GrDrawTarget* target) {}
+    GrGpuTraceMarkerGenerator() {}
 
     ~GrGpuTraceMarkerGenerator() {
         if (fTraceMarker.isValid()) {
             // TODO remove trace marker
         }
     }
 
     void initialize(const char* marker_str, int* marker_counter) {
         // GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
         // TODO add trace marker
@@ skipping 79 matching lines @@
     sk_atomic_inc(&name_counter);
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...)       \
     GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                     \
 
 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                 \
     GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);          \
     SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                    \
 
 #endif