Revert 147328 - Current status of patch:

content/common/gpu/gpu_channel.cc

 // 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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "content/common/gpu/gpu_channel.h"
 
@@ skipping 129 matching lines @@
   scoped_refptr<gpu::RefCountedCounter> unprocessed_messages_;
 };
 
 }  // anonymous namespace
 
 GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager,
                        GpuWatchdog* watchdog,
                        gfx::GLShareGroup* share_group,
                        gpu::gles2::MailboxManager* mailbox,
                        int client_id,
-                       bool software,
-                       gpu::gles2::ProgramCache* program_cache)
+                       bool software)
     : gpu_channel_manager_(gpu_channel_manager),
-      program_cache_(program_cache),
       unprocessed_messages_(new gpu::RefCountedCounter),
       client_id_(client_id),
       share_group_(share_group ? share_group : new gfx::GLShareGroup),
       mailbox_manager_(mailbox ? mailbox : new gpu::gles2::MailboxManager),
       watchdog_(watchdog),
       software_(software),
       handle_messages_scheduled_(false),
       processed_get_state_fast_(false),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(gpu_channel_manager);
@@ skipping 163 matching lines @@
       mailbox_manager_,
       gfx::Size(),
       disallowed_features_,
       init_params.allowed_extensions,
       init_params.attribs,
       init_params.gpu_preference,
       *route_id,
       surface_id,
       watchdog_,
       software_,
-      init_params.active_url,
-      program_cache_));
+      init_params.active_url));
   if (preempt_by_counter_.get())
     stub->SetPreemptByCounter(preempt_by_counter_);
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
 #endif  // ENABLE_GPU
 }
 
 GpuCommandBufferStub* GpuChannel::LookupCommandBuffer(int32 route_id) {
   return stubs_.Lookup(route_id);
 }
@@ skipping 130 matching lines @@
       gfx::GLSurfaceHandle(),
       mailbox_manager_.get(),
       size,
       disallowed_features_,
       init_params.allowed_extensions,
       init_params.attribs,
       init_params.gpu_preference,
       route_id,
       0, watchdog_,
       software_,
-      init_params.active_url,
-      program_cache_));
+      init_params.active_url));
   if (preempt_by_counter_.get())
     stub->SetPreemptByCounter(preempt_by_counter_);
   router_.AddRoute(route_id, stub.get());
   stubs_.AddWithID(stub.release(), route_id);
   TRACE_EVENT1("gpu", "GpuChannel::OnCreateOffscreenCommandBuffer",
                "route_id", route_id);
 #endif
 
   GpuChannelMsg_CreateOffscreenCommandBuffer::WriteReplyParams(
       reply_message,
@@ skipping 33 matching lines @@
 }
 
 void GpuChannel::OnEstablishStreamTexture(
     int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
     int32 primary_id, int32 secondary_id) {
   stream_texture_manager_->EstablishStreamTexture(
       stream_id, type, primary_id, secondary_id);
 }
 #endif