Merge branch 'google3'

Change-Id: I2c5f890e76873090819e7569b214af829bfd0daf

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/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

@@ -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_;