Upstream the code to pass StreamTextureManagerAndroid from GpuChannel to GLES2DecoderImpl

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>
@@ skipping 107 matching lines @@
 
   gpu::RefCountedCounter* MessagesPendingCount() {
     return unprocessed_messages_.get();
   }
 
   // If preempt_by_counter->count is non-zero, any stub on this channel
   // should stop issuing GL commands. Setting this to NULL stops deferral.
   void SetPreemptByCounter(
       scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
 
+#if defined(OS_ANDROID)
+  content::StreamTextureManagerAndroid* stream_texture_manager() {
+    return stream_texture_manager_.get();
+  }
+#endif
+
  protected:
   virtual ~GpuChannel();
 
  private:
   friend class base::RefCountedThreadSafe<GpuChannel>;
 
   void OnDestroy();
 
   bool OnControlMessageReceived(const IPC::Message& msg);
 
@@ skipping 70 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_