Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

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>
@@ skipping 41 matching lines @@
 }
 }
 
 namespace IPC {
 class ForwardingMessageFilter;
 }
 
 namespace content {
 class AudioRendererMixerManager;
 class MediaStreamCenter;
+class P2PSocketDispatcher;
 class RenderProcessObserver;
 
 namespace old {
 class BrowserPluginChannelManager;
 class BrowserPluginRegistry;
 }
 
 }
 
 namespace v8 {
@@ skipping 120 matching lines @@
     return dom_storage_dispatcher_.get();
   }
 
   AudioInputMessageFilter* audio_input_message_filter() {
     return audio_input_message_filter_.get();
   }
 
   AudioMessageFilter* audio_message_filter() {
     return audio_message_filter_.get();
   }
 

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

revert

[perkj_chrome, 2012/09/11 14:27:30]

Done.

+
+
   // 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);
 
+  // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
+  content::P2PSocketDispatcher* p2p_socket_dispatcher() {
+    return p2p_socket_dispatcher_.get();
+  }
+
   VideoCaptureImplManager* video_capture_impl_manager() const {
     return vc_manager_.get();
   }
 
   // Get the GPU channel. Returns NULL if the channel is not established or
   // has been lost.
   GpuChannelHost* GetGpuChannel();
 
   // Returns a MessageLoopProxy instance corresponding to the message loop
   // of the thread on which file operations should be run. Must be called
@@ skipping 92 matching lines @@
 
   // 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_;
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
   scoped_refptr<DevToolsAgentFilter> devtools_agent_message_filter_;
 
+  // Dispatches all P2P sockets.
+  scoped_refptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;
+
   // Used on multiple threads.
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   // Used on multiple script execution context threads.
   scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_;
 
   // Initialize COM when using plugins outside the sandbox (Windows only).
   scoped_ptr<base::win::ScopedCOMInitializer> initialize_com_;
 
   // The count of RenderWidgets running through this thread.
@@ skipping 33 matching lines @@
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> gpu_vda_context3d_;
 
   scoped_ptr<content::AudioRendererMixerManager> audio_renderer_mixer_manager_;
 
   HistogramCustomizer histogram_customizer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_