Revert of Add builders for tracing event's structural arguments

cc/trees/proxy.h

 // Copyright 2011 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.
 
 #ifndef CC_TREES_PROXY_H_
 #define CC_TREES_PROXY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/cc_export.h"
 
-namespace base {
-namespace debug {
-class TracedValue;
-}
-class SingleThreadTaskRunner;
-}
+namespace base { class SingleThreadTaskRunner; }
 
 namespace gfx {
 class Rect;
 class Vector2d;
 }
 
 namespace cc {
 
 class LayerTreeDebugState;
 class OutputSurface;
@@ skipping 54 matching lines @@
 
   // Forces 3D commands on all contexts to wait for all previous SwapBuffers
   // to finish before executing in the GPU process.
   virtual void ForceSerializeOnSwapBuffers() = 0;
 
   // Maximum number of sub-region texture updates supported for each commit.
   virtual size_t MaxPartialTextureUpdates() const = 0;
 
   virtual bool SupportsImplScrolling() const = 0;
 
-  virtual void AsValueInto(base::debug::TracedValue* value) const = 0;
+  virtual scoped_ptr<base::Value> AsValue() const = 0;
 
   virtual void SetDebugState(const LayerTreeDebugState& debug_state) = 0;
 
   // Testing hooks
   virtual bool CommitPendingForTesting() = 0;
+  virtual scoped_ptr<base::Value> SchedulerAsValueForTesting();
 
  protected:
   Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
         scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
   friend class DebugScopedSetImplThread;
   friend class DebugScopedSetMainThread;
   friend class DebugScopedSetMainThreadBlocked;
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
@@ skipping 28 matching lines @@
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {}
   ~DebugScopedSetMainThreadBlocked() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked);
 };
 #endif
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_H_