Create a new preference which disables UDP protocol for WebRTC

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

 // Copyright 2014 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/webrtc/peer_connection_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 104 matching lines @@
     }
   }
 }
 
 class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface {
  public:
   P2PPortAllocatorFactory(P2PSocketDispatcher* socket_dispatcher,
                           rtc::NetworkManager* network_manager,
                           rtc::PacketSocketFactory* socket_factory,
                           const GURL& origin,
-                          bool enable_multiple_routes)
+                          bool enable_multiple_routes,
+                          bool enable_udp_transport)

[pthatcher2, 2015/08/25 23:12:34]

Can we make some kind of struct to contain the various options
(origin+enable_multiple_routes+enable_udp_transport) instead of making more and
more parameters?

[guoweis_left_chromium, 2015/08/26 14:43:40]

origin is used for completely different things. I don't think it should be put
together. I could put enable_multiple_routes and enable_udp_transport together
if that looks better.

[pthatcher2, 2015/08/26 18:25:39]

Yeah, that would be nice.  Why not just use P2PPortAllocator::Config.

       : socket_dispatcher_(socket_dispatcher),
         network_manager_(network_manager),
         socket_factory_(socket_factory),
         origin_(origin),
-        enable_multiple_routes_(enable_multiple_routes) {}
+        enable_multiple_routes_(enable_multiple_routes),
+        enable_udp_transport_(enable_udp_transport) {}

[pthatcher2, 2015/08/25 23:12:34]

Even if we make the Chrome flag "ForceThroughProxy", I think we can keep this
one as "disable_udp_transport".

 
   cricket::PortAllocator* CreatePortAllocator(
       const std::vector<StunConfiguration>& stun_servers,
       const std::vector<TurnConfiguration>& turn_configurations) override {
     P2PPortAllocator::Config config;
     for (size_t i = 0; i < stun_servers.size(); ++i) {
       config.stun_servers.insert(rtc::SocketAddress(
           stun_servers[i].server.hostname(),
           stun_servers[i].server.port()));
     }
     for (size_t i = 0; i < turn_configurations.size(); ++i) {
       P2PPortAllocator::Config::RelayServerConfig relay_config;
       relay_config.server_address = turn_configurations[i].server.hostname();
       relay_config.port = turn_configurations[i].server.port();
       relay_config.username = turn_configurations[i].username;
       relay_config.password = turn_configurations[i].password;
       relay_config.transport_type = turn_configurations[i].transport_type;
       relay_config.secure = turn_configurations[i].secure;
       config.relays.push_back(relay_config);
     }
     config.enable_multiple_routes = enable_multiple_routes_;
+    config.disable_udp_transport = !enable_udp_transport_;

[pthatcher2, 2015/08/25 23:12:34]

Can we keep it consistent across both (either enable on both or disable on
both)?  I'd prefer "disable".

[guoweis_left_chromium, 2015/08/26 14:43:40]

I also like disable more but if we looked at the old code review on
"enable_multiple_routes", it was a CL feedback to change it from disable to
enable. For consistency, I'll keep everything to be enable_udp_transport.

 
     return new P2PPortAllocator(
         socket_dispatcher_.get(), network_manager_,
         socket_factory_, config, origin_);
   }
 
  protected:
   ~P2PPortAllocatorFactory() override {}
 
  private:
   scoped_refptr<P2PSocketDispatcher> socket_dispatcher_;
   // |network_manager_| and |socket_factory_| are a weak references, owned by
   // PeerConnectionDependencyFactory.
   rtc::NetworkManager* network_manager_;
   rtc::PacketSocketFactory* socket_factory_;
   // The origin URL of the WebFrame that created the
   // P2PPortAllocatorFactory.
   GURL origin_;
   // When false, only 'any' address (all 0s) will be bound for address
   // discovery.
   bool enable_multiple_routes_;
+
+  bool enable_udp_transport_;
 };
 
 PeerConnectionDependencyFactory::PeerConnectionDependencyFactory(
     P2PSocketDispatcher* p2p_socket_dispatcher)
     : network_manager_(NULL),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       signaling_thread_(NULL),
       worker_thread_(NULL),
       chrome_signaling_thread_("Chrome_libJingle_Signaling"),
       chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
@@ skipping 216 matching lines @@
 PeerConnectionDependencyFactory::CreatePeerConnection(
     const webrtc::PeerConnectionInterface::RTCConfiguration& config,
     const webrtc::MediaConstraintsInterface* constraints,
     blink::WebFrame* web_frame,
     webrtc::PeerConnectionObserver* observer) {
   CHECK(web_frame);
   CHECK(observer);
   if (!GetPcFactory().get())
     return NULL;
 
-  // Copy the flag from Preference associated with this WebFrame.
-  bool enable_multiple_routes = true;
   rtc::scoped_ptr<PeerConnectionIdentityStore> identity_store(
       new PeerConnectionIdentityStore(
           GURL(web_frame->document().url()),
           GURL(web_frame->document().firstPartyForCookies())));
 
+  // Copy the flag from Preference associated with this WebFrame.
+  bool enable_multiple_routes = true;
+  bool enable_udp_transport = false;
   if (web_frame && web_frame->view()) {
     RenderViewImpl* renderer_view_impl =
         RenderViewImpl::FromWebView(web_frame->view());
     if (renderer_view_impl) {
       enable_multiple_routes = renderer_view_impl->renderer_preferences()
                                     .enable_webrtc_multiple_routes;
+      enable_udp_transport = renderer_view_impl->renderer_preferences()
+                                 .enable_webrtc_udp_transport;
     }
   }
 
   scoped_refptr<P2PPortAllocatorFactory> pa_factory =
       new rtc::RefCountedObject<P2PPortAllocatorFactory>(
           p2p_socket_dispatcher_.get(), network_manager_, socket_factory_.get(),
           GURL(web_frame->document().url().spec()).GetOrigin(),
-          enable_multiple_routes);
+          enable_multiple_routes, enable_udp_transport);
 
   return GetPcFactory()->CreatePeerConnection(config,
                                               constraints,
                                               pa_factory.get(),
                                               identity_store.Pass(),
                                               observer).get();
 }
 
 scoped_refptr<webrtc::MediaStreamInterface>
 PeerConnectionDependencyFactory::CreateLocalMediaStream(
@@ skipping 247 matching lines @@
 }
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_.get())
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content