Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / inspect_ui_browsertest.cc

diff --git a/src/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/src/chrome/browser/ui/webui/inspect_ui_browsertest.cc
index 454898f..e9d9683 100644 (file)
--- a/src/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ b/src/chrome/browser/ui/webui/inspect_ui_browsertest.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/devtools/devtools_adb_bridge.h"
+#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/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
@@ -67,15 +69,20 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) {
       new base::StringValue(kSharedWorkerTestPage)));
 }
 
-IN_PROC_BROWSER_TEST_F(InspectUITest, AdbTargets) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
+IN_PROC_BROWSER_TEST_F(InspectUITest, AndroidTargets) {
+  scoped_refptr<DevToolsAndroidBridge> android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(browser()->profile());
+  AndroidDeviceManager::DeviceProviders providers;
+  providers.push_back(new AdbDeviceProvider());
+  android_bridge->set_device_providers_for_test(providers);
+
+  StartMockAdbServer();
 
-  scoped_refptr<DevToolsAdbBridge> adb_bridge =
-      DevToolsAdbBridge::Factory::GetForProfile(browser()->profile());
-  adb_bridge->set_device_provider_for_test(
-      AndroidDeviceProvider::GetMockDeviceProviderForTest());
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed"));
+
+  StopMockAdbServer();
 }
 
 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) {