Revert of Add builders for tracing event's structural arguments

cc/scheduler/scheduler.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_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/draw_result.h"
 #include "cc/scheduler/scheduler_settings.h"
 #include "cc/scheduler/scheduler_state_machine.h"
 
 namespace base {
-namespace debug {
-class ConvertableToTraceFormat;
-}
 class SingleThreadTaskRunner;
 }
 
 namespace cc {
 
 class SchedulerClient {
  public:
   virtual void SetNeedsBeginFrame(bool enable) = 0;
   virtual void WillBeginImplFrame(const BeginFrameArgs& args) = 0;
   virtual void ScheduledActionSendBeginMainFrame() = 0;
@@ skipping 89 matching lines @@
   void BeginFrame(const BeginFrameArgs& args);
   void PostBeginRetroFrame();
   void BeginRetroFrame();
   void BeginUnthrottledFrame();
 
   void BeginImplFrame(const BeginFrameArgs& args);
   void OnBeginImplFrameDeadline();
   void PollForAnticipatedDrawTriggers();
   void PollToAdvanceCommitState();
 
-  scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
+  scoped_ptr<base::Value> AsValue() const;
 
   bool IsInsideAction(SchedulerStateMachine::Action action) {
     return inside_action_ == action;
   }
 
   bool IsBeginMainFrameSent() const;
   void SetContinuousPainting(bool continuous_painting) {
     state_machine_.SetContinuousPainting(continuous_painting);
   }
 
@@ skipping 11 matching lines @@
     // Activates future BeginFrames and, if activating, pushes the most
     // recently missed BeginFrame to the back of a retroactive queue.
     void SetNeedsBeginFrame(bool needs_begin_frame,
                             std::deque<BeginFrameArgs>* begin_retro_frame_args);
 
     bool IsActive() const;
 
     // TimeSourceClient implementation of OnTimerTick triggers a BeginFrame.
     virtual void OnTimerTick() OVERRIDE;
 
-    void AsValueInto(base::debug::TracedValue* dict) const;
+    scoped_ptr<base::Value> AsValue() const;
 
    private:
     BeginFrameArgs CreateSyntheticBeginFrameArgs(base::TimeTicks frame_time);
 
     Scheduler* scheduler_;
     scoped_refptr<DelayBasedTimeSource> time_source_;
   };
 
   Scheduler(
       SchedulerClient* client,
@@ skipping 49 matching lines @@
   void SetupSyntheticBeginFrames();
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_