nearby: snapshot of cl/317978613

Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I4bf367877a986910bb03e1c54aa972b4bcd59942

cpp/core/internal/mediums/webrtc/BUILD

@@ -7,7 +7,7 @@ cc_library(
     deps = [
         "//platform:utils",
         "//platform/api",
-        "//webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -20,7 +20,7 @@ cc_test(
         "//platform/api",
         "//platform/impl/g3",  # buildcleaner: keep
         "//testing/base/public:gunit_main",
-        "//webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -45,7 +45,7 @@ cc_library(
         ":peer_id",
         "//platform:types",
         "//location/nearby/mediums/proto:web_rtc_signaling_frames_cc_proto",
-        "//webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+        "//webrtc/api:libjingle_peerconnection_api",
     ],
 )
 
@@ -72,6 +72,6 @@ cc_test(
         "//platform/impl/g3",  # buildcleaner: keep
         "//net/proto2/public:proto2",
         "//testing/base/public:gunit_main",
-        "//webrtc/files/stable/webrtc/pc:peerconnection",  # buildcleaner: keep
+        "//webrtc/pc:peerconnection",  # buildcleaner: keep
     ],
 )

cpp/core/internal/mediums/webrtc/peer_id.h

@@ -15,17 +15,17 @@ namespace mediums {
 // p2p connection.
 class PeerId {
  public:
-  explicit PeerId(const string& id) : id_(id) {}
+  explicit PeerId(const std::string& id) : id_(id) {}
   ~PeerId() = default;
 
   static ConstPtr<PeerId> FromRandom(Ptr<HashUtils> hash_utils);
   static ConstPtr<PeerId> FromSeed(ConstPtr<ByteArray> seed,
                                    Ptr<HashUtils> hash_utils);
 
-  const string& GetId() const { return id_; }
+  const std::string& GetId() const { return id_; }
 
  private:
-  const string id_;
+  const std::string id_;
 };
 
 }  // namespace mediums

cpp/core/internal/mediums/webrtc/signaling_frames.h

@@ -7,7 +7,7 @@
 #include "platform/byte_array.h"
 #include "platform/ptr.h"
 #include "location/nearby/mediums/proto/web_rtc_signaling_frames.pb.h"
-#include "webrtc/files/stable/webrtc/api/peer_connection_interface.h"
+#include "webrtc/api/peer_connection_interface.h"
 
 namespace location {
 namespace nearby {

cpp/core/internal/mediums/webrtc/webrtc_socket.cc

@@ -46,7 +46,7 @@ Exception::Value WebRtcSocket<Platform>::OutputStreamImpl::close() {
 // WebRtcSocket
 template <typename Platform>
 WebRtcSocket<Platform>::WebRtcSocket(
-    const string& name,
+    const std::string& name,
     rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel)
     : name_(name),
       data_channel_(std::move(data_channel)),

cpp/core/internal/mediums/webrtc/webrtc_socket.h

@@ -6,7 +6,7 @@
 #include "platform/api/output_stream.h"
 #include "platform/api/socket.h"
 #include "platform/pipe.h"
-#include "webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "webrtc/api/data_channel_interface.h"
 
 namespace location {
 namespace nearby {
@@ -24,7 +24,7 @@ constexpr int kMaxDataSize = 1 * 1024 * 1024;
 template <typename Platform>
 class WebRtcSocket : public Socket {
  public:
-  WebRtcSocket(const string& name,
+  WebRtcSocket(const std::string& name,
                rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel);
   ~WebRtcSocket() override = default;
 
@@ -77,7 +77,7 @@ class WebRtcSocket : public Socket {
   bool SendMessage(ConstPtr<ByteArray> data);
   void BlockUntilSufficientSpaceInBuffer(int length);
 
-  string name_;
+  std::string name_;
   rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel_;
 
   Ptr<Pipe> pipe_;

cpp/core/internal/mediums/webrtc/webrtc_socket_test.cc

@@ -5,7 +5,7 @@
 #include "platform/ptr.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "webrtc/api/data_channel_interface.h"
 
 namespace location {
 namespace nearby {