Move creation of PeerConnection from the RenderView to the RenderThreadImpl.

content/renderer/media/media_stream_center.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/media/media_stream_center.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "content/renderer/media/media_stream_extra_data.h"
+#include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_impl.h"
-#include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.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/WebSessionDescriptionDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
@@ skipping 51 matching lines @@
       return GetTrack<webrtc::VideoTracks>(
           source_id, native_stream->video_tracks());
     }
   }
   // TODO(perkj): This can occur if a JS create a new MediaStream based on an
   // existing MediaStream.
   NOTIMPLEMENTED();
   return NULL;
 }
 
-MediaStreamCenter::MediaStreamCenter(WebKit::WebMediaStreamCenterClient*) {}
+MediaStreamCenter::MediaStreamCenter(WebKit::WebMediaStreamCenterClient*,

[tommi (sloooow) - chröme, 2012/09/12 13:10:24]

missing variable name

[perkj_chrome, 2012/09/12 13:54:39]

Added but it is unused.

+                                     MediaStreamDependencyFactory* factory)
+    : rtc_factory_(factory) {
+}
 
 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) {
@@ skipping 22 matching lines @@
   if (ms_impl) {
     ms_impl->StopLocalMediaStream(stream);
     return;
   }
 
   NOTREACHED();
 }
 
 void MediaStreamCenter::didCreateMediaStream(
     WebKit::WebMediaStreamDescriptor& stream) {
-  WebKit::WebFrame* web_frame = WebKit::WebFrame::frameForCurrentContext();
-  if (!web_frame)
+  if (!rtc_factory_)
     return;
-  MediaStreamImpl* ms_impl = GetMediaStreamImpl(web_frame);
-  if (ms_impl) {
-    ms_impl->CreateMediaStream(web_frame, &stream);
-    return;
-  }
-  NOTREACHED();
+  rtc_factory_->CreateNativeLocalMediaStream(&stream);
 }
 
 WebKit::WebString MediaStreamCenter::constructSDP(
     const WebKit::WebICECandidateDescriptor& candidate) {
   int m_line_index = -1;
   if (!base::StringToInt(UTF16ToUTF8(candidate.label()), &m_line_index)) {
     LOG(ERROR) << "Invalid candidate label: " << UTF16ToUTF8(candidate.label());
     return WebKit::WebString();
   }
   // TODO(ronghuawu): Get sdp_mid from WebKit when is available.
@@ skipping 35 matching lines @@
     }
   }
 
   std::string sdp;
   if (!native_desc->ToString(&sdp))
     LOG(ERROR) << "Could not create SDP string";
   return UTF8ToUTF16(sdp);
 }
 
 }  // namespace content