DevTools: Unify ADB-related browser tests

chrome/browser/ui/webui/inspect_ui_browsertest.cc

 // Copyright (c) 2012 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/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"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/web_ui_browsertest.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 
@@ skipping 49 matching lines @@
       "testTargetListed",
       new base::StringValue("#pages"),
       new base::StringValue("populateWebContentsTargets"),
       new base::StringValue(kSharedWorkerTestPage)));
 }
 
 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) {
   ASSERT_TRUE(test_server()->Start());
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
 }
 
 }  // namespace