Rename chrome/browser/devtools/tethering_adb_filter.* to port_forwarding_controller.*

chrome/browser/devtools/port_forwarding_controller.h

Index: chrome/browser/devtools/port_forwarding_controller.h
diff --git a/chrome/browser/devtools/tethering_adb_filter.h b/chrome/browser/devtools/port_forwarding_controller.h
similarity index 21%
rename from chrome/browser/devtools/tethering_adb_filter.h
rename to chrome/browser/devtools/port_forwarding_controller.h
index 2a7946d748327d122eac6b44abddfe99d80656a2..3b53a514b609dbdc3c27739713e0567f927f912d 100644
--- a/chrome/browser/devtools/tethering_adb_filter.h
+++ b/chrome/browser/devtools/port_forwarding_controller.h
@@ -2,89 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DEVTOOLS_TETHERING_ADB_FILTER_H_
-#define CHROME_BROWSER_DEVTOOLS_TETHERING_ADB_FILTER_H_
+#ifndef CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
+#define CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
 
 #include <map>
-#include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/prefs/pref_change_registrar.h"
-#include "chrome/browser/devtools/adb_web_socket.h"
 #include "chrome/browser/devtools/devtools_adb_bridge.h"
 
 class PrefService;
 
-namespace base {
-class MessageLoop;
-}
-
-class TetheringAdbFilter : public base::RefCountedThreadSafe<
-    TetheringAdbFilter,
-    content::BrowserThread::DeleteOnUIThread> {
- public:
-  typedef DevToolsAdbBridge::RemoteDevice::PortStatus PortStatus;
-  typedef DevToolsAdbBridge::RemoteDevice::PortStatusMap PortStatusMap;
-
-  TetheringAdbFilter(scoped_refptr<DevToolsAdbBridge::AndroidDevice> device,
-                     base::MessageLoop* adb_message_loop,
-                     PrefService* pref_service,
-                     scoped_refptr<AdbWebSocket> web_socket);
-
-  const PortStatusMap& GetPortStatusMap();
-
-  bool ProcessIncomingMessage(const std::string& message);
-
- private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::UI>;
-  friend class base::DeleteHelper<TetheringAdbFilter>;
-
-  virtual ~TetheringAdbFilter();
-
-  typedef std::map<int, std::string> ForwardingMap;
-
-  typedef base::Callback<void(PortStatus)> CommandCallback;
-  typedef std::map<int, CommandCallback> CommandCallbackMap;
-
-  void OnPrefsChange();
-
-  void ChangeForwardingMap(ForwardingMap map);
-
-  void SerializeChanges(const std::string& method,
-                        const ForwardingMap& old_map,
-                        const ForwardingMap& new_map);
-
-  void SendCommand(const std::string& method, int port);
-  bool ProcessResponse(const std::string& json);
-
-  void ProcessBindResponse(int port, PortStatus status);
-  void ProcessUnbindResponse(int port, PortStatus status);
-  void UpdateSocketCount(int port, int increment);
-  void UpdatePortStatusMap();
-  void UpdatePortStatusMapOnUIThread(const PortStatusMap& status_map);
-
-  scoped_refptr<DevToolsAdbBridge::AndroidDevice> device_;
-  base::MessageLoop* adb_message_loop_;
-  PrefChangeRegistrar pref_change_registrar_;
-  scoped_refptr<AdbWebSocket> web_socket_;
-  int command_id_;
-  ForwardingMap forwarding_map_;
-  CommandCallbackMap pending_responses_;
-  PortStatusMap port_status_;
-  PortStatusMap port_status_on_ui_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(TetheringAdbFilter);
-};
-
 class PortForwardingController {
  public:
   PortForwardingController(
       scoped_refptr<DevToolsAdbBridge> bridge,
       PrefService* pref_service);
 
-  virtual ~PortForwardingController();
+  ~PortForwardingController();
 
   void UpdateDeviceList(const DevToolsAdbBridge::RemoteDevices& devices);
 
@@ -95,6 +28,8 @@ class PortForwardingController {
   scoped_refptr<DevToolsAdbBridge> bridge_;
   PrefService* pref_service_;
   Registry registry_;
+
+  DISALLOW_COPY_AND_ASSIGN(PortForwardingController);
 };
 
-#endif  // CHROME_BROWSER_DEVTOOLS_TETHERING_ADB_FILTER_H_
+#endif  // CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_