Revert 147328 - Current status of patch:

content/common/gpu/gpu_channel.h

 // Copyright (c) 2012 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_COMMON_GPU_GPU_CHANNEL_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 
 #include <deque>
 #include <string>
-#include <vector>
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/message_router.h"
@@ skipping 11 matching lines @@
 struct GPUCreateCommandBufferConfig;
 class GpuWatchdog;
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
 namespace gpu {
 struct RefCountedCounter;
-namespace gles2 {
-class ProgramCache;
-}
 }
 
 #if defined(OS_ANDROID)
 namespace content {
 class StreamTextureManagerAndroid;
 }
 #endif
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class GpuChannel : public IPC::Listener,
                    public IPC::Sender,
                    public base::RefCountedThreadSafe<GpuChannel> {
  public:
   // Takes ownership of the renderer process handle.
   GpuChannel(GpuChannelManager* gpu_channel_manager,
              GpuWatchdog* watchdog,
              gfx::GLShareGroup* share_group,
              gpu::gles2::MailboxManager* mailbox_manager,
              int client_id,
-             bool software,
-             gpu::gles2::ProgramCache* program_cache);
+             bool software);
 
   bool Init(base::MessageLoopProxy* io_message_loop,
             base::WaitableEvent* shutdown_event);
 
   // Get the GpuChannelManager that owns this channel.
   GpuChannelManager* gpu_channel_manager() const {
     return gpu_channel_manager_;
   }
 
   // Returns the name of the associated IPC channel.
@@ skipping 82 matching lines @@
   void OnEstablishStreamTexture(
       int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
       int32 primary_id, int32 secondary_id);
 #endif
 
   // The lifetime of objects of this class is managed by a GpuChannelManager.
   // The GpuChannelManager destroy all the GpuChannels that they own when they
   // are destroyed. So a raw pointer is safe.
   GpuChannelManager* gpu_channel_manager_;
 
-  gpu::gles2::ProgramCache* program_cache_;
-
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // Number of routed messages for pending processing on a stub.
   scoped_refptr<gpu::RefCountedCounter> unprocessed_messages_;
 
   // If non-NULL, all stubs on this channel should stop processing GL
   // commands (via their GpuScheduler) when preempt_by_counter_->count
   // is non-zero.
   scoped_refptr<gpu::RefCountedCounter> preempt_by_counter_;
 
@@ skipping 29 matching lines @@
 #if defined(OS_ANDROID)
   scoped_ptr<content::StreamTextureManagerAndroid> stream_texture_manager_;
 #endif
 
   base::WeakPtrFactory<GpuChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_