| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/devtools/android_device.h" | 5 #include "chrome/browser/devtools/android_device.h" |
| 6 #include "chrome/browser/devtools/devtools_adb_bridge.h" | 6 #include "chrome/browser/devtools/devtools_adb_bridge.h" |
| 7 #include "chrome/browser/devtools/devtools_target_impl.h" | 7 #include "chrome/browser/devtools/devtools_target_impl.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/test/base/in_process_browser_test.h" | 9 #include "chrome/test/base/in_process_browser_test.h" |
| 10 #include "content/public/test/test_utils.h" | 10 #include "content/public/test/test_utils.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 {} | 240 {} |
| 241 | 241 |
| 242 virtual void QueryDevices(const QueryDevicesCallback& callback) OVERRIDE { | 242 virtual void QueryDevices(const QueryDevicesCallback& callback) OVERRIDE { |
| 243 AndroidDeviceProvider::AndroidDevices devices; | 243 AndroidDeviceProvider::AndroidDevices devices; |
| 244 devices.push_back(new MockDeviceImpl("FirstDevice", 0, true, "Nexus 6")); | 244 devices.push_back(new MockDeviceImpl("FirstDevice", 0, true, "Nexus 6")); |
| 245 devices.push_back(new MockDeviceImpl("SecondDevice", 1, false, "Nexus 8")); | 245 devices.push_back(new MockDeviceImpl("SecondDevice", 1, false, "Nexus 8")); |
| 246 callback.Run(devices); | 246 callback.Run(devices); |
| 247 } | 247 } |
| 248 }; | 248 }; |
| 249 | 249 |
| 250 // static |
| 251 scoped_refptr<AndroidDeviceProvider> |
| 252 AndroidDeviceProvider::GetMockDeviceProviderForTest() { |
| 253 return new MockDeviceProvider(); |
| 254 } |
| 255 |
| 250 static scoped_refptr<DevToolsAdbBridge::RemoteBrowser> | 256 static scoped_refptr<DevToolsAdbBridge::RemoteBrowser> |
| 251 FindBrowserByDisplayName(DevToolsAdbBridge::RemoteBrowsers browsers, | 257 FindBrowserByDisplayName(DevToolsAdbBridge::RemoteBrowsers browsers, |
| 252 const std::string& name) { | 258 const std::string& name) { |
| 253 for (DevToolsAdbBridge::RemoteBrowsers::iterator it = browsers.begin(); | 259 for (DevToolsAdbBridge::RemoteBrowsers::iterator it = browsers.begin(); |
| 254 it != browsers.end(); ++it) | 260 it != browsers.end(); ++it) |
| 255 if ((*it)->display_name() == name) | 261 if ((*it)->display_name() == name) |
| 256 return *it; | 262 return *it; |
| 257 return NULL; | 263 return NULL; |
| 258 } | 264 } |
| 259 | 265 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 DevToolsAdbBridge::RemoteDevices devices_; | 354 DevToolsAdbBridge::RemoteDevices devices_; |
| 349 }; | 355 }; |
| 350 | 356 |
| 351 IN_PROC_BROWSER_TEST_F(DevToolsAdbBridgeTest, DiscoverAndroidBrowsers) { | 357 IN_PROC_BROWSER_TEST_F(DevToolsAdbBridgeTest, DiscoverAndroidBrowsers) { |
| 352 init(); | 358 init(); |
| 353 | 359 |
| 354 scoped_refptr<DevToolsAdbBridge> adb_bridge = | 360 scoped_refptr<DevToolsAdbBridge> adb_bridge = |
| 355 DevToolsAdbBridge::Factory::GetForProfile(browser()->profile()); | 361 DevToolsAdbBridge::Factory::GetForProfile(browser()->profile()); |
| 356 | 362 |
| 357 DevToolsAdbBridge::DeviceProviders providers; | 363 DevToolsAdbBridge::DeviceProviders providers; |
| 358 providers.push_back(new MockDeviceProvider()); | 364 providers.push_back(AndroidDeviceProvider::GetMockDeviceProviderForTest()); |
| 359 | 365 |
| 360 adb_bridge->set_device_providers(providers); | 366 adb_bridge->set_device_providers(providers); |
| 361 | 367 |
| 362 if (!adb_bridge) { | 368 if (!adb_bridge) { |
| 363 FAIL() << "Failed to get DevToolsAdbBridge."; | 369 FAIL() << "Failed to get DevToolsAdbBridge."; |
| 364 } | 370 } |
| 365 | 371 |
| 366 adb_bridge->AddListener(this); | 372 adb_bridge->AddListener(this); |
| 367 | 373 |
| 368 runner_->Run(); | 374 runner_->Run(); |
| 369 | 375 |
| 370 CheckDevices(); | 376 CheckDevices(); |
| 371 } | 377 } |
| OLD | NEW |