MergeNetworkList can't group address under the same interface

content/renderer/p2p/socket_dispatcher.h

Index: content/renderer/p2p/socket_dispatcher.h
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 6ad48c39c29e8d64f82bc5b66a14c57bc50ba9d8..fcad97ed273b24fd85ceb2743afb3782964a7103 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -48,19 +48,37 @@ class P2PAsyncAddressResolver;
 class P2PSocketClientImpl;
 class RenderViewImpl;
 
-class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter {
+class NetworkListObserverManager {

[Sergey Ulanov, 2014/09/10 22:28:25]

Please move this to a separate file and add comments to explain what it's used
for.

[guoweis_webrtc, 2014/09/10 23:22:25]

Done.

+ public:
+  // Add a new network list observer.
+  virtual void AddNetworkListObserver(
+    NetworkListObserver* network_list_observer) = 0;
+
+  // Removes network list observer.
+  virtual void RemoveNetworkListObserver(
+    NetworkListObserver* network_list_observer) = 0;
+
+ protected:
+  // Marked as protected to prevent explicit deletion, as
+  // P2PSocketDispatcher is not owned by IpcNetworkManager.
+  virtual ~NetworkListObserverManager() {}
+};
+
+class CONTENT_EXPORT P2PSocketDispatcher :
+  public IPC::MessageFilter, public NetworkListObserverManager {
  public:
   explicit P2PSocketDispatcher(base::MessageLoopProxy* ipc_message_loop);
 
-  // Add a new network list observer. Each observer is called
-  // immidiately after it is registered and then later whenever
-  // network configuration changes. Can be called on any thread. The
-  // observer is always called on the thread it was added.
-  void AddNetworkListObserver(NetworkListObserver* network_list_observer);
+  // Each observer is called immidiately after it is registered and
+  // then later whenever network configuration changes. Can be called
+  // on any thread. The observer is always called on the thread it was
+  // added.
+  virtual void AddNetworkListObserver(
+    NetworkListObserver* network_list_observer) OVERRIDE;
 
-  // Removes network list observer. Must be called on the thread on
-  // which the observer was added.
-  void RemoveNetworkListObserver(NetworkListObserver* network_list_observer);
+  // Must be called on the thread on which the observer was added.
+  virtual void RemoveNetworkListObserver(
+    NetworkListObserver* network_list_observer) OVERRIDE;
 
  protected:
   virtual ~P2PSocketDispatcher();