| Index: cc/gl_renderer_unittest.cc | 
| diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc | 
| index 01b1d510f1735e5f359ebfe6d9aadb3c2d07e81e..56e659534ecce52fe05c1c1f4c1f6642f22dc55b 100644 | 
| --- a/cc/gl_renderer_unittest.cc | 
| +++ b/cc/gl_renderer_unittest.cc | 
| @@ -9,7 +9,6 @@ | 
| #include "cc/prioritized_texture_manager.h" | 
| #include "cc/resource_provider.h" | 
| #include "cc/settings.h" | 
| -#include "cc/single_thread_proxy.h" | 
| #include "cc/test/fake_web_compositor_output_surface.h" | 
| #include "cc/test/fake_web_graphics_context_3d.h" | 
| #include "cc/test/test_common.h" | 
| @@ -42,9 +41,6 @@ public: | 
| int frameCount() { return m_frame; } | 
| void setMemoryAllocation(WebGraphicsMemoryAllocation allocation) | 
| { | 
| -        DCHECK(Proxy::isImplThread()); | 
| -        // In single threaded mode we expect this callback on main thread. | 
| -        DebugScopedSetMainThread main; | 
| m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation); | 
| } | 
|  | 
| @@ -76,6 +72,7 @@ public: | 
| virtual void setFullRootLayerDamage() OVERRIDE { m_setFullRootLayerDamageCount++; } | 
| virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { m_memoryAllocationLimitBytes = policy.bytesLimitWhenVisible; } | 
| virtual void enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { if (m_lastCallWasSetVisibility) *m_lastCallWasSetVisibility = false; } | 
| +    virtual bool hasImplThread() const OVERRIDE { return false; } | 
|  | 
| // Methods added for test. | 
| int setFullRootLayerDamageCount() const { return m_setFullRootLayerDamageCount; } | 
| @@ -90,7 +87,6 @@ public: | 
| private: | 
| int m_setFullRootLayerDamageCount; | 
| bool* m_lastCallWasSetVisibility; | 
| -    DebugScopedSetImplThread m_implThread; | 
| scoped_ptr<LayerImpl> m_rootLayer; | 
| RenderPassList m_renderPassesInDrawOrder; | 
| RenderPassIdHashMap m_renderPasses; | 
|  |