android: Remove in-process video path

content/renderer/render_thread_impl.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.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 1516 matching lines @@
         CreateOffscreenContext3d(), RENDERER_MAINTHREAD_CONTEXT);
     if (shared_main_thread_contexts_.get() &&
         !shared_main_thread_contexts_->BindToCurrentThread())
       shared_main_thread_contexts_ = NULL;
   }
   return shared_main_thread_contexts_;
 }
 
 #if defined(OS_ANDROID)
 
-namespace {
-base::LazyInstance<scoped_refptr<StreamTextureFactory>>
-    g_stream_texture_factory_override;
-}
-
-// static
-void RenderThreadImpl::SetStreamTextureFactory(
-    scoped_refptr<StreamTextureFactory> factory) {
-  g_stream_texture_factory_override.Get() = factory;
-}
-
 scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() {
   DCHECK(IsMainThread());
-  if (g_stream_texture_factory_override.Get()) {
-    stream_texture_factory_ = g_stream_texture_factory_override.Get();
-  } else if (!stream_texture_factory_.get() ||
-             stream_texture_factory_->ContextGL()
-                     ->GetGraphicsResetStatusKHR() != GL_NO_ERROR) {
+  if (!stream_texture_factory_.get() ||
+      stream_texture_factory_->ContextGL()->GetGraphicsResetStatusKHR() !=
+          GL_NO_ERROR) {
     if (!SharedMainThreadContextProvider().get()) {
       stream_texture_factory_ = NULL;
       return NULL;
     }
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(EstablishGpuChannelSync(
         CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE));
     if (!gpu_channel_host.get()) {
       LOG(ERROR) << "Failed to establish GPU channel for media player";
       stream_texture_factory_ = NULL;
     } else {
       stream_texture_factory_ = StreamTextureFactoryImpl::Create(
           shared_main_thread_contexts_, gpu_channel_host.get());
     }
   }
   return stream_texture_factory_;
 }
 
 bool RenderThreadImpl::EnableStreamTextureCopy() {
-  return !g_stream_texture_factory_override.Get() &&
-         sync_compositor_message_filter_.get();
+  return sync_compositor_message_filter_.get();
 }
 
 #endif
 
 AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() {
   if (!audio_renderer_mixer_manager_) {
     audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager());
   }
 
   return audio_renderer_mixer_manager_.get();
@@ skipping 562 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content