blink: Rename platform/ methods to prefix with get when they collide.

content/renderer/media/rtc_peer_connection_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 
 #include <string.h>
 
 #include <string>
 #include <utility>
@@ skipping 750 matching lines @@
     }
 
     main_thread_->PostTask(FROM_HERE,
         base::Bind(&RTCPeerConnectionHandler::Observer::OnIceCandidateImpl,
             this, sdp, candidate->sdp_mid(), candidate->sdp_mline_index(),
             candidate->candidate().component(),
             candidate->candidate().address().family()));
   }
 
   void OnAddStreamImpl(scoped_ptr<RemoteMediaStreamImpl> stream) {
-    DCHECK(stream->webkit_stream().extraData()) << "Initialization not done";
+    DCHECK(stream->webkit_stream().getExtraData()) << "Initialization not done";
     if (handler_)
       handler_->OnAddStream(std::move(stream));
   }
 
   void OnRemoveStreamImpl(const scoped_refptr<MediaStreamInterface>& stream) {
     if (handler_)
       handler_->OnRemoveStream(stream);
   }
 
   void OnDataChannelImpl(scoped_ptr<RtcDataChannelHandler> handler) {
@@ skipping 709 matching lines @@
     peer_connection_tracker_->TrackOnRenegotiationNeeded(this);
   if (!is_closed_)
     client_->negotiationNeeded();
 }
 
 void RTCPeerConnectionHandler::OnAddStream(
     scoped_ptr<RemoteMediaStreamImpl> stream) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(remote_streams_.find(stream->webrtc_stream().get()) ==
          remote_streams_.end());
-  DCHECK(stream->webkit_stream().extraData()) << "Initialization not done";
+  DCHECK(stream->webkit_stream().getExtraData()) << "Initialization not done";
   TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnAddStreamImpl");
 
   // Ownership is with remote_streams_ now.
   RemoteMediaStreamImpl* s = stream.release();
   remote_streams_.insert(
       std::pair<webrtc::MediaStreamInterface*, RemoteMediaStreamImpl*> (
           s->webrtc_stream().get(), s));
 
   if (peer_connection_tracker_) {
     peer_connection_tracker_->TrackAddStream(
@@ skipping 159 matching lines @@
 }
 
 void RTCPeerConnectionHandler::ResetUMAStats() {
   DCHECK(thread_checker_.CalledOnValidThread());
   num_local_candidates_ipv6_ = 0;
   num_local_candidates_ipv4_ = 0;
   ice_connection_checking_start_ = base::TimeTicks();
   memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
 }
 }  // namespace content