DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
+#include "net/base/net_errors.h"
 
 using content::BrowserThread;
 
 static scoped_refptr<DevToolsAndroidBridge::RemoteBrowser>
 FindBrowserByDisplayName(DevToolsAndroidBridge::RemoteBrowsers browsers,
                          const std::string& name) {
   for (DevToolsAndroidBridge::RemoteBrowsers::iterator it = browsers.begin();
       it != browsers.end(); ++it)
     if ((*it)->display_name() == name)
       return *it;
   return NULL;
 }
 
+static void ResponseReceived(int result, const std::string& response) {
+  ASSERT_EQ(net::OK, result);
+  base::MessageLoop::current()->QuitWhenIdle();
+}
+
+static void ConnectedReceived(bool expected, bool received) {
+  ASSERT_EQ(expected, received);
+  base::MessageLoop::current()->QuitWhenIdle();
+}
+
 class AdbClientSocketTest : public InProcessBrowserTest,
                             public DevToolsAndroidBridge::DeviceListListener {
 
  public:
   void StartTest() {
     Profile* profile = browser()->profile();
     android_bridge_ = DevToolsAndroidBridge::Factory::GetForProfile(profile);
     AndroidDeviceManager::DeviceProviders device_providers;
     device_providers.push_back(new AdbDeviceProvider());
     android_bridge_->set_device_providers_for_test(device_providers);
@@ skipping 74 matching lines @@
 
     ASSERT_EQ(GURL("http://www.chromium.org/"),
                    chrome_pages[0]->GetTarget()->GetURL());
     ASSERT_EQ("The Chromium Projects",
               chrome_pages[0]->GetTarget()->GetTitle());
 
     STLDeleteElements(&chrome_pages);
     STLDeleteElements(&webview_pages);
   }
 
+  void CheckConnection() {
+    ASSERT_EQ(2U, devices_.size());
+    scoped_refptr<DevToolsAndroidBridge::RemoteDevice> connected =
+        devices_[0]->is_connected() ? devices_[0] : devices_[1];
+    const DevToolsAndroidBridge::RemoteBrowsers& browsers =
+        connected->browsers();
+    scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> chrome =
+        FindBrowserByDisplayName(browsers, "Chrome");
+    ASSERT_TRUE(chrome);
+    chrome->SendJsonRequest("GET /json/version HTTP/1.1\r\n\r\n",

[Vladislav Kaznacheev, 2014/05/19 10:32:11]

Heads up: you will need to rebase because
https://chromiumcodereview.appspot.com/288353005/ (about to land) will change
the semantics for SendJsonRequest parameter. Pass "json/version" instead.

[vkuzkokov, 2014/05/20 12:34:29]

Done.

+        base::Bind(&ResponseReceived));
+  }
+
+  void CheckCleanup() {
+    android_bridge_->IsConnectedForTest("01498B321301A00A",
+        base::Bind(&ConnectedReceived, true));
+    content::RunMessageLoop();
+    devices_.clear();
+    android_bridge_->IsConnectedForTest("01498B321301A00A",
+        base::Bind(&ConnectedReceived, false));
+    content::RunMessageLoop();
+  }
+
  private:
   scoped_refptr<DevToolsAndroidBridge> android_bridge_;
   DevToolsAndroidBridge::RemoteDevices devices_;
 };
 
 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) {
   StartMockAdbServer();
   StartTest();
   content::RunMessageLoop();
   CheckDevices();
   StopMockAdbServer();
 }
+
+// DevToolsAndroidBridge used to free connected devices when there are no
+// listeners. We test that it's no longer the case.
+IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestRemoteConnection) {
+  StartMockAdbServer();
+  StartTest();
+  content::RunMessageLoop();

[Vladislav Kaznacheev, 2014/05/19 10:32:11]

We have discussed this but I forgot to write this down. Please move
content::RunMessageLoop() from here into StartTest. Same for line 174

[vkuzkokov, 2014/05/20 12:34:29]

Done.

+  CheckConnection();
+  content::RunMessageLoop();
+  CheckCleanup();
+  StopMockAdbServer();
+}