Merge branch 'master' into release.

Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d

cpp/platform_v2/impl/g3/platform.cc

@@ -42,6 +42,8 @@
 #include "platform_v2/impl/g3/scheduled_executor.h"
 #include "platform_v2/impl/g3/settable_future_any.h"
 #include "platform_v2/impl/g3/single_thread_executor.h"
+#include "platform_v2/impl/g3/webrtc.h"
+#include "platform_v2/impl/shared/file.h"
 #include "absl/base/integral_types.h"
 #include "absl/memory/memory.h"
 #include "absl/time/time.h"
@@ -50,6 +52,12 @@ namespace location {
 namespace nearby {
 namespace api {
 
+namespace {
+std::string GetPayloadPath(std::int64_t payload_id) {
+  return "/tmp/" + std::to_string(payload_id);
+}
+}  // namespace
+
 std::unique_ptr<SubmittableExecutor>
 ImplementationPlatform::CreateSingleThreadExecutor() {
   return absl::make_unique<g3::SingleThreadExecutor>();
@@ -90,6 +98,17 @@ std::unique_ptr<AtomicBoolean> ImplementationPlatform::CreateAtomicBoolean(
   return absl::make_unique<g3::AtomicBoolean>(initial_value);
 }
 
+std::unique_ptr<InputFile> ImplementationPlatform::CreateInputFile(
+    std::int64_t payload_id, std::int64_t total_size) {
+  return absl::make_unique<shared::InputFile>(GetPayloadPath(payload_id),
+                                              total_size);
+}
+
+std::unique_ptr<OutputFile> ImplementationPlatform::CreateOutputFile(
+    std::int64_t payload_id) {
+  return absl::make_unique<shared::OutputFile>(GetPayloadPath(payload_id));
+}
+
 std::unique_ptr<BluetoothClassicMedium>
 ImplementationPlatform::CreateBluetoothClassicMedium() {
   return std::unique_ptr<BluetoothClassicMedium>();
@@ -116,11 +135,8 @@ std::unique_ptr<WifiLanMedium> ImplementationPlatform::CreateWifiLanMedium() {
   return std::unique_ptr<WifiLanMedium>();
 }
 
-std::unique_ptr<WebRtcSignalingMessenger>
-ImplementationPlatform::CreateWebRtcSignalingMessenger(
-    absl::string_view self_id) {
-  return std::unique_ptr<WebRtcSignalingMessenger>(
-      /*new FCMSignalingMessenger()*/);
+std::unique_ptr<WebRtcMedium> ImplementationPlatform::CreateWebRtcMedium() {
+  return absl::make_unique<g3::WebRtcMedium>();
 }
 
 std::unique_ptr<Mutex> ImplementationPlatform::CreateMutex(Mutex::Mode mode) {
@@ -141,10 +157,6 @@ std::string ImplementationPlatform::GetDeviceId() {
   return "google3";
 }
 
-std::string ImplementationPlatform::GetPayloadPath(int64_t payload_id) {
-  return "/tmp/" + std::to_string(payload_id);
-}
-
 }  // namespace api
 }  // namespace nearby
 }  // namespace location