Revert 217691 "Merge 217276 "Add media::VideoEncodeAccelerator w..."

content/renderer/render_thread_impl.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_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/memory_pressure_listener.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/child/child_thread.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
+#include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ui/gfx/native_widget_types.h"
 
 class GrContext;
 class SkBitmap;
 struct ViewMsg_New_Params;
 
 namespace WebKit {
 class WebGamepads;
 class WebGraphicsContext3D;
@@ skipping 15 matching lines @@
 namespace cc {
 class ContextProvider;
 }
 
 namespace IPC {
 class ForwardingMessageFilter;
 }
 
 namespace media {
 class AudioHardwareConfig;
+class GpuVideoDecoderFactories;
 }
 
 namespace v8 {
 class Extension;
 }
 
 namespace webkit {
 namespace gpu {
 class GrContextForWebGraphicsContext3D;
 }
@@ skipping 182 matching lines @@
   // Returns a MessageLoopProxy instance corresponding to the message loop
   // of the thread on which media operations should be run. Must be called
   // on the renderer's main thread.
   scoped_refptr<base::MessageLoopProxy> GetMediaThreadMessageLoopProxy();
 
   // Causes the idle handler to skip sending idle notifications
   // on the two next scheduled calls, so idle notifications are
   // not sent for at least one notification delay.
   void PostponeIdleNotification();
 
-  // Gets gpu factories, which will run on |factories_loop|.
-  scoped_refptr<RendererGpuVideoAcceleratorFactories> GetGpuFactories(
+  // Gets gpu factories, which will run on |factories_loop|. Returns NULL if VDA
+  // is disabled or a graphics context cannot be obtained.
+  scoped_refptr<RendererGpuVideoDecoderFactories> GetGpuFactories(
       const scoped_refptr<base::MessageLoopProxy>& factories_loop);
 
   // Returns a graphics context shared among all
   // RendererGpuVideoDecoderFactories, or NULL on error.  Context remains owned
   // by this class and must be null-tested before each use to detect context
   // loss.  The returned context is only valid on the compositor thread when
   // threaded compositing is enabled.
   WebGraphicsContext3DCommandBufferImpl* GetGpuVDAContext3D();
 
   // Handle loss of the shared GpuVDAContext3D context above.
@@ skipping 218 matching lines @@
   scoped_ptr<WebRTCIdentityService> webrtc_identity_service_;
 
   scoped_ptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_