Adds DataChannelInit param to createDataChannel.

content/renderer/media/rtc_peer_connection_handler.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
@@ skipping 110 matching lines @@
 
   virtual bool addStream(
       const WebKit::WebMediaStream& stream,
       const WebKit::WebMediaConstraints& options) OVERRIDE;
   virtual void removeStream(
       const WebKit::WebMediaStream& stream) OVERRIDE;
   virtual void getStats(
       const WebKit::WebRTCStatsRequest& request) OVERRIDE;
   virtual WebKit::WebRTCDataChannelHandler* createDataChannel(
       const WebKit::WebString& label, bool reliable) OVERRIDE;
+  virtual WebKit::WebRTCDataChannelHandler* createDataChannel(
+      const WebKit::WebString& label,
+      const WebKit::WebRTCDataChannelInit& init) OVERRIDE;

[Ami GONE FROM CHROMIUM, 2013/06/03 18:27:31]

FYI if you remove OVERRIDE you can land CLs a bit more freely (don't have to
wait for as many rolls from chromium into blink and from blink into chromium).
Just remember to add back any OVERRIDEs that apply when you're done.

(chromium has a clang plugin that checks that all virtual methods specify
OVERRIDE, but there's an exception for WebKit-implementing things for exactly
this reason)

[jiayl, 2013/06/03 18:52:58]

Hmm, but I still depend on the definition of DataChannelInit in the same Blink
CL.
On 2013/06/03 18:27:31, Ami Fischman wrote:

[Ami GONE FROM CHROMIUM, 2013/06/03 19:32:19]

True; this would just allow you to remove the old function in the same blink CL
that converts to using the new function.

[jiayl, 2013/06/03 19:54:51]

I see. Makes sense!
On 2013/06/03 19:32:19, Ami Fischman wrote:

   virtual WebKit::WebRTCDTMFSenderHandler* createDTMFSender(
       const WebKit::WebMediaStreamTrack& track) OVERRIDE;
   virtual void stop() OVERRIDE;
 
   // webrtc::PeerConnectionObserver implementation
   virtual void OnError() OVERRIDE;
   // Triggered when the SignalingState changed.
   virtual void OnSignalingChange(
       webrtc::PeerConnectionInterface::SignalingState new_state) OVERRIDE;
   virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
@@ skipping 30 matching lines @@
   WebKit::WebFrame* frame_;
 
   PeerConnectionTracker* peer_connection_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_