Bug 1569183: Rename SetProxyServer to SetProxyConfig to better reflect what is actually going on. r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D45100

--HG--
extra : moz-landing-system : lando

dom/media/webrtc/MediaTransportParent.h

@@ -24,7 +24,7 @@ class MediaTransportParent : public dom::PMediaTransportParent {
   mozilla::ipc::IPCResult RecvCreateIceCtx(
       const string& name, nsTArray<RTCIceServer>&& iceServers,
       const RTCIceTransportPolicy& icePolicy);
-  mozilla::ipc::IPCResult RecvSetProxyServer(const dom::TabId& tabId,
+  mozilla::ipc::IPCResult RecvSetProxyConfig(const dom::TabId& tabId,
                                              const net::LoadInfoArgs& args,
                                              const nsCString& alpn);
   mozilla::ipc::IPCResult RecvEnsureProvisionalTransport(

dom/media/webrtc/PMediaTransport.ipdl

@@ -46,7 +46,7 @@ parent:
                      RTCIceServer[] iceServers,
                      RTCIceTransportPolicy icePolicy);
 
-  async SetProxyServer(TabId id,
+  async SetProxyConfig(TabId id,
                        LoadInfoArgs args, // Does this have the id?
                        nsCString alpn);
 

media/mtransport/nricectx.cpp

@@ -847,7 +847,7 @@ nsresult NrIceCtx::SetResolver(nr_resolver* resolver) {
   return NS_OK;
 }
 
-nsresult NrIceCtx::SetProxyServer(NrSocketProxyConfig&& config) {
+nsresult NrIceCtx::SetProxyConfig(NrSocketProxyConfig&& config) {
   proxy_config_.reset(new NrSocketProxyConfig(std::move(config)));
   return NS_OK;
 }

media/mtransport/nricectx.h

@@ -300,7 +300,7 @@ class NrIceCtx {
 
   // Provide the proxy address. Must be called before
   // StartGathering.
-  nsresult SetProxyServer(NrSocketProxyConfig&& config);
+  nsresult SetProxyConfig(NrSocketProxyConfig&& config);
 
   const std::shared_ptr<NrSocketProxyConfig>& GetProxyConfig() {
     return proxy_config_;

media/webrtc/signaling/gtest/mediapipeline_unittest.cpp

@@ -153,7 +153,7 @@ class LoopbackTransport : public MediaTransportHandler {
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
-  void SetProxyServer(NrSocketProxyConfig&& aProxyConfig) override {}
+  void SetProxyConfig(NrSocketProxyConfig&& aProxyConfig) override {}
 
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aLocalUfrag,

media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp

@@ -72,7 +72,7 @@ class MediaTransportHandlerSTS : public MediaTransportHandler,
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
-  void SetProxyServer(NrSocketProxyConfig&& aProxyConfig) override;
+  void SetProxyConfig(NrSocketProxyConfig&& aProxyConfig) override;
 
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aUfrag,
@@ -510,13 +510,13 @@ void MediaTransportHandlerSTS::Destroy() {
       [](const std::string& aError) {});
 }
 
-void MediaTransportHandlerSTS::SetProxyServer(
+void MediaTransportHandlerSTS::SetProxyConfig(
     NrSocketProxyConfig&& aProxyConfig) {
   mInitPromise->Then(
       mStsThread, __func__,
       [this, self = RefPtr<MediaTransportHandlerSTS>(this),
        aProxyConfig = std::move(aProxyConfig)]() mutable {
-        mIceCtx->SetProxyServer(std::move(aProxyConfig));
+        mIceCtx->SetProxyConfig(std::move(aProxyConfig));
       },
       [](const std::string& aError) {});
 }

media/webrtc/signaling/src/peerconnection/MediaTransportHandler.h

@@ -71,7 +71,7 @@ class MediaTransportHandler {
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
-  virtual void SetProxyServer(NrSocketProxyConfig&& aProxyConfig) = 0;
+  virtual void SetProxyConfig(NrSocketProxyConfig&& aProxyConfig) = 0;
 
   virtual void EnsureProvisionalTransport(const std::string& aTransportId,
                                           const std::string& aLocalUfrag,

media/webrtc/signaling/src/peerconnection/MediaTransportHandlerIPC.cpp

@@ -162,14 +162,14 @@ void MediaTransportHandlerIPC::Destroy() {
 
 // We will probably be able to move the proxy lookup stuff into
 // this class once we move mtransport to its own process.
-void MediaTransportHandlerIPC::SetProxyServer(
+void MediaTransportHandlerIPC::SetProxyConfig(
     NrSocketProxyConfig&& aProxyConfig) {
   mInitPromise->Then(
       mCallbackThread, __func__,
       [aProxyConfig = std::move(aProxyConfig), this,
        self = RefPtr<MediaTransportHandlerIPC>(this)](bool /*dummy*/) mutable {
         if (mChild) {
-          mChild->SendSetProxyServer(dom::TabId(aProxyConfig.GetTabId()),
+          mChild->SendSetProxyConfig(dom::TabId(aProxyConfig.GetTabId()),
                                      aProxyConfig.GetLoadInfoArgs(),
                                      aProxyConfig.GetAlpn());
         }

media/webrtc/signaling/src/peerconnection/MediaTransportHandlerIPC.h

@@ -29,7 +29,7 @@ class MediaTransportHandlerIPC : public MediaTransportHandler {
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
-  void SetProxyServer(NrSocketProxyConfig&& aProxyConfig) override;
+  void SetProxyConfig(NrSocketProxyConfig&& aProxyConfig) override;
 
   void EnsureProvisionalTransport(const std::string& aTransportId,
                                   const std::string& aLocalUfrag,

media/webrtc/signaling/src/peerconnection/MediaTransportParent.cpp

@@ -135,10 +135,10 @@ mozilla::ipc::IPCResult MediaTransportParent::RecvCreateIceCtx(
   return ipc::IPCResult::Ok();
 }
 
-mozilla::ipc::IPCResult MediaTransportParent::RecvSetProxyServer(
+mozilla::ipc::IPCResult MediaTransportParent::RecvSetProxyConfig(
     const dom::TabId& tabId, const net::LoadInfoArgs& args,
     const nsCString& alpn) {
-  mImpl->mHandler->SetProxyServer(NrSocketProxyConfig(tabId, alpn, args));
+  mImpl->mHandler->SetProxyConfig(NrSocketProxyConfig(tabId, alpn, args));
   return ipc::IPCResult::Ok();
 }
 

media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp

@@ -421,7 +421,7 @@ void PeerConnectionMedia::EnsureIceGathering(bool aDefaultRouteOnly,
     // was constructed with a peerIdentity constraint, not when isolated
     // streams are added.  If we ever need to signal to the proxy that the
     // media is isolated, then we would need to restructure this code.
-    mTransportHandler->SetProxyServer(std::move(*mProxyConfig));
+    mTransportHandler->SetProxyConfig(std::move(*mProxyConfig));
     mProxyConfig.reset();
   }