DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

chrome/browser/devtools/device/self_device_provider.cc

Index: chrome/browser/devtools/device/self_device_provider.cc
diff --git a/chrome/browser/devtools/device/self_device_provider.cc b/chrome/browser/devtools/device/self_device_provider.cc
index 24fa6ca4120e0e4dba4956ad4e39d8cb1f75e6cb..ee0f0433594bea890f4f729e9f696049d12c7499 100644
--- a/chrome/browser/devtools/device/self_device_provider.cc
+++ b/chrome/browser/devtools/device/self_device_provider.cc
@@ -13,29 +13,31 @@ namespace {
 const char kDeviceModel[] = "Local Chrome";
 const char kBrowserName[] = "Chrome";
 const char kLocalhost[] = "127.0.0.1";
+const char kSerial[] = "local";
 
-class SelfAsDevice : public AndroidDeviceManager::Device {
- public:
-  explicit SelfAsDevice(int port);
-
-  virtual void QueryDeviceInfo(const DeviceInfoCallback& callback) OVERRIDE;
+static void RunSocketCallback(
+    const AndroidDeviceManager::SocketCallback& callback,
+    net::StreamSocket* socket,
+    int result) {
+  callback.Run(result, socket);
+}
 
-  virtual void OpenSocket(const std::string& socket_name,
-                          const SocketCallback& callback) OVERRIDE;
- private:
-  virtual ~SelfAsDevice() {}
+}  // namespace
 
-  int port_;
-};
+SelfAsDeviceProvider::SelfAsDeviceProvider(int port) : port_(port) {
+}
 
-SelfAsDevice::SelfAsDevice(int port)
-    : Device("local", true),
-      port_(port)
-{}
+void SelfAsDeviceProvider::QueryDevices(const SerialsCallback& callback) {
+  std::vector<std::string> result;
+  result.push_back(kSerial);
+  callback.Run(result);
+}
 
-void SelfAsDevice::QueryDeviceInfo(const DeviceInfoCallback& callback) {
+void SelfAsDeviceProvider::QueryDeviceInfo(const std::string& serial,
+                                           const DeviceInfoCallback& callback) {
   AndroidDeviceManager::DeviceInfo device_info;
   device_info.model = kDeviceModel;
+  device_info.connected = true;
 
   AndroidDeviceManager::BrowserInfo browser_info;
   browser_info.socket_name = base::IntToString(port_);
@@ -48,16 +50,9 @@ void SelfAsDevice::QueryDeviceInfo(const DeviceInfoCallback& callback) {
       FROM_HERE, base::Bind(callback, device_info));
 }
 
-static void RunSocketCallback(
-    const AndroidDeviceManager::SocketCallback& callback,
-    net::StreamSocket* socket,
-    int result) {
-  callback.Run(result, socket);
-}
-
-void SelfAsDevice::OpenSocket(const std::string& socket_name,
-                              const SocketCallback& callback) {
-  DCHECK(CalledOnValidThread());
+void SelfAsDeviceProvider::OpenSocket(const std::string& serial,
+                                      const std::string& socket_name,
+                                      const SocketCallback& callback) {
   // Use plain socket for remote debugging and port forwarding on Desktop
   // (debugging purposes).
   net::IPAddressNumber ip_number;
@@ -70,15 +65,3 @@ void SelfAsDevice::OpenSocket(const std::string& socket_name,
       address_list, NULL, net::NetLog::Source());
   socket->Connect(base::Bind(&RunSocketCallback, callback, socket));
 }
-
-} // namespace
-
-SelfAsDeviceProvider::SelfAsDeviceProvider(int port)
-    : port_(port) {
-}
-
-void SelfAsDeviceProvider::QueryDevices(const QueryDevicesCallback& callback) {
-  AndroidDeviceManager::Devices result;
-  result.push_back(new SelfAsDevice(port_));
-  callback.Run(result);
-}