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..0d73046a7aca1cbe64be8663c0963125730c8ea5 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -30,6 +30,7 @@
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_socket_type.h"
+#include "content/renderer/p2p/network_list_manager.h"
 #include "ipc/message_filter.h"
 #include "net/base/net_util.h"
 
@@ -48,19 +49,17 @@ class P2PAsyncAddressResolver;
 class P2PSocketClientImpl;
 class RenderViewImpl;
 
-class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter {
+class CONTENT_EXPORT P2PSocketDispatcher :
+  public IPC::MessageFilter, public NetworkListManager {

[Sergey Ulanov, 2014/09/10 23:37:16]

This should be formatted either like this:

class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter,
                                           public NetworkListManager {


or this:

class CONTENT_EXPORT P2PSocketDispatcher
    : public IPC::MessageFilter,
      public NetworkListManager {


Also please try using clang-format
(https://code.google.com/p/chromium/wiki/ClangFormat)

[guoweis_webrtc, 2014/09/11 00:15:32]

Done.

  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);
+  // NetworkListManager interface:
+  virtual void AddNetworkListObserver(
+    NetworkListObserver* network_list_observer) OVERRIDE;
 

[Sergey Ulanov, 2014/09/10 23:37:16]

nit: remove this empty line

[guoweis_webrtc, 2014/09/11 00:15:32]

Done.

-  // Removes network list observer. Must be called on the thread on
-  // which the observer was added.
-  void RemoveNetworkListObserver(NetworkListObserver* network_list_observer);
+  virtual void RemoveNetworkListObserver(
+    NetworkListObserver* network_list_observer) OVERRIDE;
 
  protected:
   virtual ~P2PSocketDispatcher();