Merge TetheringAdbFilter into PortForwardingController::Connection class.

chrome/browser/devtools/port_forwarding_controller.h

 // Copyright (c) 2013 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 CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
 #define CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
 
 #include <map>
 
 #include "chrome/browser/devtools/devtools_adb_bridge.h"
 
 class PrefService;
 
 class PortForwardingController {
  public:
   PortForwardingController(
       scoped_refptr<DevToolsAdbBridge> bridge,
       PrefService* pref_service);
 
   virtual ~PortForwardingController();
 
   void UpdateDeviceList(const DevToolsAdbBridge::RemoteDevices& devices);
 
  private:
   class Connection;
-  typedef std::map<std::string, Connection*> Registry;
+  typedef std::map<std::string, scoped_refptr<Connection> > Registry;
 
   scoped_refptr<DevToolsAdbBridge> bridge_;
   PrefService* pref_service_;
   Registry registry_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_