| Index: ui/compositor/test/in_process_context_factory.h
|
| diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
|
| index 23f7d48b92033aa21c7551bfe9757cf3f6b4eeb5..7ac9f92c208ea4e9e91a32a8b68dfda3126ffa49 100644
|
| --- a/ui/compositor/test/in_process_context_factory.h
|
| +++ b/ui/compositor/test/in_process_context_factory.h
|
| @@ -13,12 +13,6 @@ namespace base {
|
| class Thread;
|
| }
|
|
|
| -namespace webkit {
|
| -namespace gpu {
|
| -class ContextProviderWebContext;
|
| -}
|
| -}
|
| -
|
| namespace ui {
|
|
|
| class InProcessContextFactory : public ContextFactory {
|
| @@ -52,8 +46,7 @@ class InProcessContextFactory : public ContextFactory {
|
|
|
| private:
|
| scoped_ptr<base::Thread> compositor_thread_;
|
| - scoped_refptr<webkit::gpu::ContextProviderWebContext>
|
| - shared_main_thread_contexts_;
|
| + scoped_refptr<cc::ContextProvider> shared_main_thread_contexts_;
|
| cc::TestSharedBitmapManager shared_bitmap_manager_;
|
| cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
|
| uint32_t next_surface_id_namespace_;
|
|
|