Revert 125629 - Adding a skeleton MediaStreamCenter.

Replacing http://codereview.chromium.org/9309078/

BUG=
TEST=


Review URL: http://codereview.chromium.org/9619006

TBR=mflodman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9639017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125631 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 2 insertions, 143 deletions

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index efd920a..e0cfc41 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -263,8 +263,6 @@
         '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
       ],
       'sources': [
-        'renderer/media/media_stream_center.cc',
-        'renderer/media/media_stream_center.h',
         'renderer/media/media_stream_dependency_factory.cc',
         'renderer/media/media_stream_dispatcher.cc',
         'renderer/media/media_stream_impl.cc',
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
deleted file mode 100644
index 172a151..0000000
--- a/content/renderer/media/media_stream_center.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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/media/media_stream_center.h"
-
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
-
-namespace content {
-
-MediaStreamCenter::MediaStreamCenter(
-    WebKit::WebMediaStreamCenterClient* client)
-    : client_(client) {
-}
-
-void MediaStreamCenter::queryMediaStreamSources(
-    const WebKit::WebMediaStreamSourcesRequest& request) {
-  WebKit::WebVector<WebKit::WebMediaStreamSource> audioSources, videoSources;
-  request.didCompleteQuery(audioSources, videoSources);
-}
-
-void MediaStreamCenter::didEnableMediaStreamTrack(
-    const WebKit::WebMediaStreamDescriptor& stream,
-    const WebKit::WebMediaStreamComponent& component) {
-}
-
-void MediaStreamCenter::didDisableMediaStreamTrack(
-    const WebKit::WebMediaStreamDescriptor& stream,
-    const WebKit::WebMediaStreamComponent& component) {
-}
-
-void MediaStreamCenter::didStopLocalMediaStream(
-    const WebKit::WebMediaStreamDescriptor& stream) {
-}
-
-void MediaStreamCenter::didConstructMediaStream(
-    const WebKit::WebMediaStreamDescriptor& stream) {
-}
-
-}  // namespace content
diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h
deleted file mode 100644
index 11c1fc4..0000000
--- a/content/renderer/media/media_stream_center.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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_MEDIA_MEDIA_STREAM_CENTER_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "content/common/content_export.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h"
-
-namespace WebKit {
-class WebMediaStreamCenterClient;
-}
-
-namespace content {
-
-class CONTENT_EXPORT MediaStreamCenter
-    : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter) {
- public:
-  explicit MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client);
-
-  virtual void queryMediaStreamSources(
-      const WebKit::WebMediaStreamSourcesRequest& request) OVERRIDE;
-
-  virtual void didEnableMediaStreamTrack(
-      const WebKit::WebMediaStreamDescriptor& stream,
-      const WebKit::WebMediaStreamComponent& component) OVERRIDE;
-
-  virtual void didDisableMediaStreamTrack(
-      const WebKit::WebMediaStreamDescriptor& stream,
-      const WebKit::WebMediaStreamComponent& component) OVERRIDE;
-
-  virtual void didStopLocalMediaStream(
-      const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
-
-  virtual void didConstructMediaStream(
-      const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
-
- private:
-  // Weak pointer, owned by WebKit.
-  WebKit::WebMediaStreamCenterClient* client_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 4806d3b..f4a9d66 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -48,7 +48,6 @@
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
-#include "content/renderer/media/media_stream_center.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "content/renderer/plugin_channel_host.h"
@@ -210,8 +209,6 @@ void RenderThreadImpl::Init() {
   main_thread_indexed_db_dispatcher_.reset(
       IndexedDBDispatcher::ThreadSpecificInstance());
 
-  media_stream_center_ = NULL;
-
   db_message_filter_ = new DBMessageFilter();
   AddFilter(db_message_filter_.get());
 
@@ -927,17 +924,6 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
   return GetGpuChannel();
 }
 
-WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(
-    WebKit::WebMediaStreamCenterClient* client) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableMediaStream)) {
-    return NULL;
-  }
-  if (!media_stream_center_)
-    media_stream_center_ = new content::MediaStreamCenter(client);
-  return media_stream_center_;
-}
-
 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
   if (!gpu_channel_.get())
     return NULL;
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 4b24657..04c096d 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -40,8 +40,6 @@ struct ViewMsg_New_Params;
 class WebDatabaseObserverImpl;
 
 namespace WebKit {
-class WebMediaStreamCenter;
-class WebMediaStreamCenterClient;
 class WebStorageEventDispatcher;
 }
 
@@ -54,7 +52,6 @@ class ScopedCOMInitializer;
 }
 
 namespace content {
-class MediaStreamCenter;
 class RenderProcessObserver;
 }
 
@@ -172,11 +169,6 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
     return audio_message_filter_.get();
   }
 
-  // Creates the embedder implementation of WebMediaStreamCenter.
-  // The resulting object is owned by WebKit and deleted by WebKit at tear-down.
-  WebKit::WebMediaStreamCenter* CreateMediaStreamCenter(
-      WebKit::WebMediaStreamCenterClient* client);
-
   VideoCaptureImplManager* video_capture_impl_manager() const {
     return vc_manager_.get();
   }
@@ -220,9 +212,6 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
   scoped_ptr<RendererWebKitPlatformSupportImpl> webkit_platform_support_;
   scoped_ptr<WebKit::WebStorageEventDispatcher> dom_storage_event_dispatcher_;
 
-  // Used on the render thread and deleted by WebKit at shutdown.
-  content::MediaStreamCenter* media_stream_center_;
-
   // Used on the renderer and IPC threads.
   scoped_refptr<DBMessageFilter> db_message_filter_;
   scoped_refptr<AudioInputMessageFilter> audio_input_message_filter_;
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index be296d0..1c5fc6f 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -38,8 +38,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
@@ -86,10 +84,6 @@ using WebKit::WebIDBFactory;
 using WebKit::WebIDBKey;
 using WebKit::WebIDBKeyPath;
 using WebKit::WebKitPlatformSupport;
-using WebKit::WebMediaStreamCenter;
-using WebKit::WebMediaStreamCenterClient;
-using WebKit::WebPeerConnectionHandler;
-using WebKit::WebPeerConnectionHandlerClient;
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebStorageArea;
 using WebKit::WebStorageEventDispatcher;
@@ -654,9 +648,9 @@ void RendererWebKitPlatformSupportImpl::GetPlugins(
 
 //------------------------------------------------------------------------------
 
-WebPeerConnectionHandler*
+WebKit::WebPeerConnectionHandler*
 RendererWebKitPlatformSupportImpl::createPeerConnectionHandler(
-    WebPeerConnectionHandlerClient* client) {
+    WebKit::WebPeerConnectionHandlerClient* client) {
   WebFrame* web_frame = WebFrame::frameForCurrentContext();
   if (!web_frame)
     return NULL;
@@ -665,15 +659,3 @@ RendererWebKitPlatformSupportImpl::createPeerConnectionHandler(
     return NULL;
   return render_view->CreatePeerConnectionHandler(client);
 }
-
-//------------------------------------------------------------------------------
-
-WebMediaStreamCenter*
-RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
-    WebMediaStreamCenterClient* client) {
-  RenderThreadImpl* render_thread = RenderThreadImpl::current();
-  DCHECK(render_thread);
-  if (!render_thread)
-    return NULL;
-  return render_thread->CreateMediaStreamCenter(client);
-}
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h
index ce4a61c..18fa046 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_webkitplatformsupport_impl.h
@@ -94,8 +94,6 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
                           std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
   virtual WebKit::WebPeerConnectionHandler* createPeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client) OVERRIDE;
-  virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(
-      WebKit::WebMediaStreamCenterClient* client) OVERRIDE;
 
  private:
   bool CheckPreparsedJsCachingEnabled() const;