| Index: cc/trees/proxy.h
 | 
| diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
 | 
| index 2f181fc7688a929f070799f2f93db58aec8decdb..539effeda7a9588414adeea6061c67e3c79e199d 100644
 | 
| --- a/cc/trees/proxy.h
 | 
| +++ b/cc/trees/proxy.h
 | 
| @@ -20,14 +20,8 @@ namespace base {
 | 
|  namespace trace_event {
 | 
|  class TracedValue;
 | 
|  }
 | 
| -
 | 
| -// TODO(ssid): remove these aliases after the tracing clients are moved to the
 | 
| -// new trace_event namespace. See crbug.com/451032. ETA: March 2015
 | 
| -namespace debug {
 | 
| -using ::base::trace_event::TracedValue;
 | 
| -}
 | 
|  class SingleThreadTaskRunner;
 | 
| -}  // namespace base
 | 
| +}
 | 
|  
 | 
|  namespace gfx {
 | 
|  class Rect;
 | 
| @@ -62,6 +56,7 @@ class CC_EXPORT Proxy {
 | 
|    virtual void FinishAllRendering() = 0;
 | 
|  
 | 
|    virtual bool IsStarted() const = 0;
 | 
| +  virtual bool CommitToActiveTree() const = 0;
 | 
|  
 | 
|    // Will call LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted
 | 
|    // with the result of this function.
 | 
| @@ -108,7 +103,7 @@ class CC_EXPORT Proxy {
 | 
|  
 | 
|    virtual bool SupportsImplScrolling() const = 0;
 | 
|  
 | 
| -  virtual void AsValueInto(base::debug::TracedValue* value) const = 0;
 | 
| +  virtual void AsValueInto(base::trace_event::TracedValue* value) const = 0;
 | 
|  
 | 
|    virtual void SetDebugState(const LayerTreeDebugState& debug_state) = 0;
 | 
|  
 | 
| 
 |