Updated the MockWebRtcPeerConnectionHandler used in blink Layouttests.

content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h

Index: content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h
diff --git a/content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h b/content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h
index 43f9d34fb83e153986c8a5474598c7171f4c0533..5eefad1d8a144dfdf84bd1a8a38872350bf27915 100644
--- a/content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h
+++ b/content/shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h
@@ -5,12 +5,15 @@
 #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;
@@ -26,6 +29,7 @@ class MockWebRTCPeerConnectionHandler
   MockWebRTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client,
       TestInterfaces* interfaces);
+  virtual ~MockWebRTCPeerConnectionHandler();
 
   // WebRTCPeerConnectionHandler related methods
   virtual bool initialize(
@@ -73,7 +77,11 @@ class MockWebRTCPeerConnectionHandler
   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_;
@@ -82,6 +90,9 @@ class MockWebRTCPeerConnectionHandler
   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);
 };