Cleanup: Move ContextProviderWebContext into cc/blink.

content/renderer/pepper/video_decoder_shim.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
 #define CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/video_decode_accelerator.h"
 
 #include "ppapi/c/pp_codecs.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
+namespace cc_blink {
+class ContextProviderWebContext;
+}
+
 namespace gpu {
 namespace gles2 {
 class GLES2Interface;
 }
 }
 
 namespace media {
 class DecoderBuffer;
 }
 
-namespace webkit {
-namespace gpu {
-class ContextProviderWebContext;
-}
-}
-
 namespace content {
 
 class PepperVideoDecoderHost;
 
 // This class is a shim to wrap a media::VideoDecoder so that it can be used
 // by PepperVideoDecoderHost in place of a media::VideoDecodeAccelerator.
 // This class should be constructed, used, and destructed on the main (render)
 // thread.
 class VideoDecoderShim : public media::VideoDecodeAccelerator {
  public:
@@ skipping 33 matching lines @@
   void DeleteTexture(uint32_t texture_id);
   // Call this whenever we change GL state that the plugin relies on, such as
   // creating picture textures.
   void FlushCommandBuffer();
 
   scoped_ptr<DecoderImpl> decoder_impl_;
   State state_;
 
   PepperVideoDecoderHost* host_;
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
-  scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider_;
+  scoped_refptr<cc_blink::ContextProviderWebContext> context_provider_;
 
   // The current decoded frame size.
   gfx::Size texture_size_;
   // Map that takes the plugin's GL texture id to the renderer's GL texture id.
   typedef base::hash_map<uint32_t, uint32_t> TextureIdMap;
   TextureIdMap texture_id_map_;
   // Available textures (these are plugin ids.)
   typedef base::hash_set<uint32_t> TextureIdSet;
   TextureIdSet available_textures_;
   // Track textures that are no longer needed (these are plugin ids.)
@@ skipping 16 matching lines @@
   uint32_t num_pending_decodes_;
 
   base::WeakPtrFactory<VideoDecoderShim> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderShim);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_