| Index: cc/test/fake_proxy.h
|
| diff --git a/cc/test/fake_proxy.h b/cc/test/fake_proxy.h
|
| index dc04c701894b543f4b1e67e7dc6f45a4f132aa32..27cd72cab558ebaeeb5e28e08ca3d61fd3cf9a54 100644
|
| --- a/cc/test/fake_proxy.h
|
| +++ b/cc/test/fake_proxy.h
|
| @@ -42,7 +42,7 @@ class FakeProxy : public Proxy {
|
| virtual size_t MaxPartialTextureUpdates() const OVERRIDE;
|
| virtual bool SupportsImplScrolling() const OVERRIDE;
|
| virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {}
|
| - virtual bool CommitPendingForTesting() OVERRIDE;
|
| + virtual bool MainFrameWillHappenForTesting() OVERRIDE;
|
| virtual void AsValueInto(base::debug::TracedValue* state) const OVERRIDE;
|
|
|
| virtual RendererCapabilities& GetRendererCapabilities();
|
|
|