Update from https://crrev.com/316786

cc/test/fake_proxy.h

Index: cc/test/fake_proxy.h
diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h
index e77d4f9deab96425e0625d37bcf642845254eccb..2309fefa8c6b2f701899769604fb7089b0fdeacf 100644
--- a/cc/test/fake_proxy.h
+++ b/cc/test/fake_proxy.h
@@ -23,6 +23,7 @@ class FakeProxy : public Proxy {
 
   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 {}
@@ -45,7 +46,7 @@ class FakeProxy : public Proxy {
   bool SupportsImplScrolling() const override;
   void SetDebugState(const LayerTreeDebugState& debug_state) override {}
   bool MainFrameWillHappenForTesting() override;
-  void AsValueInto(base::debug::TracedValue* state) const override;
+  void AsValueInto(base::trace_event::TracedValue* state) const override;
   void SetChildrenNeedBeginFrames(bool children_need_begin_frames) override {}
 
   virtual RendererCapabilities& GetRendererCapabilities();