DevTools: Unify ADB-related browser tests

Merged devtools_android_bridge_browsertest.cc logic into adb_client_socket_browser_test.cc.
Made inspect_ui_browsertest.cc use MockAdbServer instead of a mock DeviceProvider.

BUG=None

Review URL: https://codereview.chromium.org/257563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266302 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/devtools/device/adb/mock_adb_server.h

+// 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.
+
+#ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_ADB_MOCK_ADB_SERVER_H_
+#define CHROME_BROWSER_DEVTOOLS_DEVICE_ADB_MOCK_ADB_SERVER_H_
+
+// Single instance mock ADB server for use in browser tests. Runs on IO thread.
+
+// These methods can be called from any thread.
+void StartMockAdbServer();
+void StopMockAdbServer();
+
+#endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_ADB_MOCK_ADB_SERVER_H_

chrome/browser/devtools/device/android_device_manager.h

@@ -35,9 +35,9 @@ class AndroidDeviceManager
                             const CommandCallback& callback) = 0;
     virtual void OpenSocket(const std::string& socket_name,
                             const SocketCallback& callback) = 0;
-    virtual void HttpQuery(const std::string& la_name,
-                           const std::string& request,
-                           const CommandCallback& callback);
+    void HttpQuery(const std::string& la_name,
+                   const std::string& request,
+                   const CommandCallback& callback);
     void HttpUpgrade(const std::string& la_name,
                      const std::string& request,
                      const SocketCallback& callback);
@@ -91,8 +91,6 @@ class AndroidDeviceManager
   static scoped_refptr<DeviceProvider> GetUsbDeviceProvider(Profile* profile);
   // Use only in a test and/or when DEBUG_DEVTOOLS is defined.
   static scoped_refptr<DeviceProvider> GetSelfAsDeviceProvider(int port);
-  // Implemented in browser_tests.
-  static scoped_refptr<DeviceProvider> GetMockDeviceProviderForTest();
 
   static scoped_refptr<AndroidDeviceManager> Create();
 

chrome/browser/ui/webui/inspect_ui_browsertest.cc

@@ -2,6 +2,7 @@
 // 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/mock_adb_server.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -71,12 +72,16 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, AndroidTargets) {
   scoped_refptr<DevToolsAndroidBridge> android_bridge =
       DevToolsAndroidBridge::Factory::GetForProfile(browser()->profile());
   AndroidDeviceManager::DeviceProviders providers;
-  providers.push_back(AndroidDeviceManager::GetMockDeviceProviderForTest());
+  providers.push_back(AndroidDeviceManager::GetAdbDeviceProvider());
   android_bridge->set_device_providers_for_test(providers);
 
+  StartMockAdbServer();
+
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed"));
+
+  StopMockAdbServer();
 }
 
 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) {

chrome/chrome_tests.gypi

@@ -971,7 +971,8 @@
         'browser/crash_recovery_browsertest.cc',
         'browser/custom_handlers/protocol_handler_registry_browsertest.cc',
         'browser/devtools/device/adb/adb_client_socket_browsertest.cc',
-        'browser/devtools/device/devtools_android_bridge_browsertest.cc',
+        'browser/devtools/device/adb/mock_adb_server.cc',
+        'browser/devtools/device/adb/mock_adb_server.h',
         'browser/devtools/device/port_forwarding_browsertest.cc',
         'browser/devtools/devtools_sanity_browsertest.cc',
         'browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc',