Revert 147328 - Current status of patch:

gpu/command_buffer/service/context_group.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 GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
 class IdAllocatorInterface;
 class TransferBufferManagerInterface;
 
 namespace gles2 {
 
-class ProgramCache;
 class BufferManager;
 class GLES2Decoder;
 class FramebufferManager;
 class MailboxManager;
 class RenderbufferManager;
 class ProgramManager;
 class ShaderManager;
 class TextureManager;
 struct DisallowedFeatures;
 
 // A Context Group helps manage multiple GLES2Decoders that share
 // resources.
 class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
  public:
   typedef scoped_refptr<ContextGroup> Ref;
 
   ContextGroup(
       MailboxManager* mailbox_manager,
-      bool bind_generates_resource,
-      ProgramCache* program_cache);
+      bool bind_generates_resource);
 
   // This should only be called by GLES2Decoder. This must be paired with a
   // call to destroy if it succeeds.
   bool Initialize(const DisallowedFeatures& disallowed_features,
                   const char* allowed_features);
 
   // Destroys all the resources when called for the last context in the group.
   // It should only be called by GLES2Decoder.
   void Destroy(bool have_context);
 
@@ skipping 87 matching lines @@
   bool bind_generates_resource_;
 
   uint32 max_vertex_attribs_;
   uint32 max_texture_units_;
   uint32 max_texture_image_units_;
   uint32 max_vertex_texture_image_units_;
   uint32 max_fragment_uniform_vectors_;
   uint32 max_varying_vectors_;
   uint32 max_vertex_uniform_vectors_;
 
-  ProgramCache* program_cache_;
-
   scoped_ptr<BufferManager> buffer_manager_;
 
   scoped_ptr<FramebufferManager> framebuffer_manager_;
 
   scoped_ptr<RenderbufferManager> renderbuffer_manager_;
 
   scoped_ptr<TextureManager> texture_manager_;
 
   scoped_ptr<ProgramManager> program_manager_;
 
   scoped_ptr<ShaderManager> shader_manager_;
 
   linked_ptr<IdAllocatorInterface>
       id_namespaces_[id_namespaces::kNumIdNamespaces];
 
   FeatureInfo::Ref feature_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_