Updated the MockWebRtcPeerConnectionHandler used in blink Layouttests.

content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h

 // Copyright 2014 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_SHELL_RENDERER_TEST_RUNNER_MOCKWEBRTCPEERCONNECTIONHANDLER_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCKWEBRTCPEERCONNECTIONHANDLER_H_
 
+#include <map>
+
 #include "base/basictypes.h"
 #include "content/shell/renderer/test_runner/web_task.h"
 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h"
 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h"
 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h"
 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 
 namespace blink {
 class WebRTCPeerConnectionHandlerClient;
 };
 
 namespace content {
 
 class TestInterfaces;
 
 class MockWebRTCPeerConnectionHandler
     : public blink::WebRTCPeerConnectionHandler {
  public:
   MockWebRTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client,
       TestInterfaces* interfaces);
+  virtual ~MockWebRTCPeerConnectionHandler();
 
   // WebRTCPeerConnectionHandler related methods
   virtual bool initialize(
       const blink::WebRTCConfiguration& configuration,
       const blink::WebMediaConstraints& constraints) OVERRIDE;
 
   virtual void createOffer(
       const blink::WebRTCSessionDescriptionRequest& request,
       const blink::WebMediaConstraints& constraints) OVERRIDE;
   virtual void createOffer(
@@ skipping 27 matching lines @@
       const blink::WebString& label,
       const blink::WebRTCDataChannelInit& init) OVERRIDE;
   virtual blink::WebRTCDTMFSenderHandler* createDTMFSender(
       const blink::WebMediaStreamTrack& track) OVERRIDE;
   virtual void stop() OVERRIDE;
 
   // WebTask related methods
   WebTaskList* mutable_task_list() { return &task_list_; }
 
  private:
-  MockWebRTCPeerConnectionHandler();

[hta - Chromium, 2014/09/30 09:43:49]

Hmm.... I think there was a reason for this existing once upon a time, but I
can't remember what it was .... its existence ensures that there can't be a
compiler-generated version, but I don't think there is one generated by default.
Suspicious about deleting it anyway.

+  // UpdateRemoteStreams uses the collection of |local_streams_| to create
+  // remote MediaStreams with the same amount of tracks and notifies |client_|

[hta - Chromium, 2014/09/30 09:43:49]

Nit: amount of tracks -> number of tracks

[perkj_chrome, 2014/09/30 18:38:31]

Done.

+  // about added and removed streams. Its triggered when setRemoteDescription

[hta - Chromium, 2014/09/30 09:43:50]

Nit: Its -> It's

[perkj_chrome, 2014/09/30 18:38:31]

Done.

+  // is called.
+  void UpdateRemoteStreams();
 
   blink::WebRTCPeerConnectionHandlerClient* client_;
   bool stopped_;
   WebTaskList task_list_;
   blink::WebRTCSessionDescription local_description_;
   blink::WebRTCSessionDescription remote_description_;
   int stream_count_;
   TestInterfaces* interfaces_;
+  typedef std::map<std::string, blink::WebMediaStream> StreamMap;

[hta - Chromium, 2014/09/30 09:43:50]

Strange question: What is the type of blink::WebMediaStream - is it a pointer, a
wrapper around a pointer, or a full fledged object?

The way this is written, it looks as if you're taking copies of the objects.

[perkj_chrome, 2014/09/30 18:38:30]

They are simple objects around a smart pointers.

+  StreamMap local_streams_;
+  StreamMap remote_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(MockWebRTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCKWEBRTCPEERCONNECTIONHANDLER_H_