Update from https://crrev.com/316786

cc/trees/single_thread_proxy.h

Index: cc/trees/single_thread_proxy.h
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 132610a4aef166ee6fe5567bfcb7233525047c86..52dd876de9da1b9bd7f9f80864b82275bc9b93c0 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -38,6 +38,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   // Proxy implementation
   void FinishAllRendering() override;
   bool IsStarted() const override;
+  bool CommitToActiveTree() const override;
   void SetOutputSurface(scoped_ptr<OutputSurface>) override;
   void SetLayerTreeHostClientReady() override;
   void SetVisible(bool visible) override;
@@ -58,7 +59,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   size_t MaxPartialTextureUpdates() const override;
   void ForceSerializeOnSwapBuffers() override;
   bool SupportsImplScrolling() const override;
-  void AsValueInto(base::debug::TracedValue* state) const override;
+  void AsValueInto(base::trace_event::TracedValue* state) const override;
   bool MainFrameWillHappenForTesting() override;
   void SetChildrenNeedBeginFrames(bool children_need_begin_frames) override;