Update from https://crrev.com/316786

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 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;
 }
-class SingleThreadTaskRunner;
-}  // namespace base
 
 namespace gfx {
 class Rect;
 class Vector2d;
 }
 
 namespace cc {
 class BlockingTaskRunner;
 class LayerTreeDebugState;
 class OutputSurface;
@@ skipping 14 matching lines @@
 #if DCHECK_IS_ON()
   void SetMainThreadBlocked(bool is_main_thread_blocked);
   void SetCurrentThreadIsImplThread(bool is_impl_thread);
 #endif
 
   virtual ~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.
   virtual void SetOutputSurface(scoped_ptr<OutputSurface> output_surface) = 0;
 
   // Indicates that the compositing surface associated with our context is
   // ready to use.
   virtual void SetLayerTreeHostClientReady() = 0;
 
   virtual void SetVisible(bool visible) = 0;
@@ skipping 26 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 void AsValueInto(base::trace_event::TracedValue* value) const = 0;
 
   virtual void SetDebugState(const LayerTreeDebugState& debug_state) = 0;
 
   virtual void SetChildrenNeedBeginFrames(bool children_need_begin_frames) = 0;
 
   // Testing hooks
   virtual bool MainFrameWillHappenForTesting() = 0;
 
   BlockingTaskRunner* blocking_main_thread_task_runner() const {
     return blocking_main_thread_task_runner_.get();
@@ skipping 41 matching lines @@
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {}
   ~DebugScopedSetMainThreadBlocked() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked);
 };
 #endif
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_H_