MergeNetworkList can't group address under the same interface

content/renderer/p2p/socket_dispatcher.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.
 
 // P2PSocketDispatcher is a per-renderer object that dispatchers all
 // P2P messages received from the browser and relays all P2P messages
 // sent to the browser. P2PSocketClient instances register themselves
 // with the dispatcher using RegisterClient() and UnregisterClient().
 //
 // Relationship of classes.
@@ skipping 12 matching lines @@
 
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/observer_list_threadsafe.h"
 #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"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace net {
 class IPEndPoint;
 }  // namespace net
 
 namespace content {
 
 class NetworkListObserver;
 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();
 
  private:
   friend class P2PAsyncAddressResolver;
   friend class P2PSocketClientImpl;
 
   // Send a message asynchronously.
   virtual void Send(IPC::Message* message);
@@ skipping 42 matching lines @@
       network_list_observers_;
 
   IPC::Sender* sender_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_