Move filtering_network_manager.h and network_manager_uma.h out of the Blink API

This is a follow up of [1].

[1] https://crrev.com/c/1805159

BUG=787254, 919392
R=guidou@chromium.org, haraken@chromium.org

Change-Id: Ib3198c792586ebe2671b365d17d46201a07d5aa5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806975
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697621}

third_party/blink/public/BUILD.gn

@@ -150,11 +150,9 @@ source_set("blink_headers") {
     "platform/modules/mediastream/web_platform_media_stream_track.h",
     "platform/modules/mediastream/webrtc_uma_histograms.h",
     "platform/modules/p2p/empty_network_manager.h",
-    "platform/modules/p2p/filtering_network_manager.h",
     "platform/modules/p2p/ipc_network_manager.h",
     "platform/modules/p2p/network_list_manager.h",
     "platform/modules/p2p/network_list_observer.h",
-    "platform/modules/p2p/network_manager_uma.h",
     "platform/modules/p2p/socket_client.h",
     "platform/modules/peerconnection/audio_codec_factory.h",
     "platform/modules/peerconnection/rtc_event_log_output_sink.h",

third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc

@@ -25,7 +25,6 @@
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h"
 #include "third_party/blink/public/platform/modules/p2p/empty_network_manager.h"
-#include "third_party/blink/public/platform/modules/p2p/filtering_network_manager.h"
 #include "third_party/blink/public/platform/modules/p2p/ipc_network_manager.h"
 #include "third_party/blink/public/platform/modules/peerconnection/audio_codec_factory.h"
 #include "third_party/blink/public/platform/modules/peerconnection/video_codec_factory.h"
@@ -42,6 +41,7 @@
 #include "third_party/blink/public/web/modules/webrtc/webrtc_audio_device_impl.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/platform/p2p/filtering_network_manager.h"
 #include "third_party/blink/renderer/platform/p2p/ipc_socket_factory.h"
 #include "third_party/blink/renderer/platform/p2p/mdns_responder_adapter.h"
 #include "third_party/blink/renderer/platform/p2p/port_allocator.h"

third_party/blink/renderer/platform/BUILD.gn

@@ -1231,6 +1231,7 @@ jumbo_component("platform") {
     "mojo/string16_mojom_traits.h",
     "p2p/empty_network_manager.cc",
     "p2p/filtering_network_manager.cc",
+    "p2p/filtering_network_manager.h",
     "p2p/host_address_request.cc",
     "p2p/host_address_request.h",
     "p2p/ipc_network_manager.cc",
@@ -1239,6 +1240,7 @@ jumbo_component("platform") {
     "p2p/mdns_responder_adapter.cc",
     "p2p/mdns_responder_adapter.h",
     "p2p/network_manager_uma.cc",
+    "p2p/network_manager_uma.h",
     "p2p/port_allocator.cc",
     "p2p/port_allocator.h",
     "p2p/socket_client_delegate.h",

third_party/blink/renderer/platform/p2p/empty_network_manager.cc

@@ -8,7 +8,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "third_party/blink/public/platform/modules/p2p/network_manager_uma.h"
+#include "third_party/blink/renderer/platform/p2p/network_manager_uma.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/p2p/filtering_network_manager.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/platform/modules/p2p/filtering_network_manager.h"
+#include "third_party/blink/renderer/platform/p2p/filtering_network_manager.h"
 
 #include <utility>
 

third_party/blink/public/platform/modules/p2p/filtering_network_manager.h → third_party/blink/renderer/platform/p2p/filtering_network_manager.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_FILTERING_NETWORK_MANAGER_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_FILTERING_NETWORK_MANAGER_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_FILTERING_NETWORK_MANAGER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_FILTERING_NETWORK_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "third_party/blink/public/platform/modules/p2p/network_manager_uma.h"
 #include "third_party/blink/public/platform/web_common.h"
+#include "third_party/blink/renderer/platform/p2p/network_manager_uma.h"
 #include "third_party/webrtc/rtc_base/network.h"
 #include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
 #include "url/gurl.h"
@@ -125,4 +125,4 @@ class FilteringNetworkManager : public rtc::NetworkManagerBase,
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_FILTERING_NETWORK_MANAGER_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_FILTERING_NETWORK_MANAGER_H_

third_party/blink/renderer/platform/p2p/filtering_network_manager_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/platform/modules/p2p/filtering_network_manager.h"
+#include "third_party/blink/renderer/platform/p2p/filtering_network_manager.h"
 
 #include <stddef.h>
 

third_party/blink/renderer/platform/p2p/network_manager_uma.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/platform/modules/p2p/network_manager_uma.h"
+#include "third_party/blink/renderer/platform/p2p/network_manager_uma.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"

third_party/blink/public/platform/modules/p2p/network_manager_uma.h → third_party/blink/renderer/platform/p2p/network_manager_uma.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_NETWORK_MANAGER_UMA_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_NETWORK_MANAGER_UMA_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_NETWORK_MANAGER_UMA_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_NETWORK_MANAGER_UMA_H_
 
-#include "third_party/blink/public/platform/web_common.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace base {
 class TimeDelta;
@@ -28,10 +28,10 @@ enum IPPermissionStatus {
   PERMISSION_MAX,
 };
 
-BLINK_PLATFORM_EXPORT void ReportIPPermissionStatus(IPPermissionStatus status);
-BLINK_PLATFORM_EXPORT void ReportTimeToUpdateNetworkList(
+PLATFORM_EXPORT void ReportIPPermissionStatus(IPPermissionStatus status);
+PLATFORM_EXPORT void ReportTimeToUpdateNetworkList(
     const base::TimeDelta& ticks);
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_P2P_NETWORK_MANAGER_UMA_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_P2P_NETWORK_MANAGER_UMA_H_