OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/device/adb/adb_device_provider.h" | 5 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" |
6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" | 6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" |
7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" | 7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" |
8 #include "chrome/browser/devtools/devtools_target_impl.h" | 8 #include "chrome/browser/devtools/devtools_target_impl.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 device_providers.push_back(new AdbDeviceProvider()); | 34 device_providers.push_back(new AdbDeviceProvider()); |
35 android_bridge_->set_device_providers_for_test(device_providers); | 35 android_bridge_->set_device_providers_for_test(device_providers); |
36 android_bridge_->AddDeviceListListener(this); | 36 android_bridge_->AddDeviceListListener(this); |
37 content::RunMessageLoop(); | 37 content::RunMessageLoop(); |
38 } | 38 } |
39 | 39 |
40 void DeviceListChanged( | 40 void DeviceListChanged( |
41 const DevToolsAndroidBridge::RemoteDevices& devices) override { | 41 const DevToolsAndroidBridge::RemoteDevices& devices) override { |
42 devices_ = devices; | 42 devices_ = devices; |
43 android_bridge_->RemoveDeviceListListener(this); | 43 android_bridge_->RemoveDeviceListListener(this); |
44 base::MessageLoop::current()->Quit(); | 44 base::MessageLoop::current()->QuitWhenIdle(); |
45 } | 45 } |
46 | 46 |
47 void CheckDevices() { | 47 void CheckDevices() { |
48 ASSERT_EQ(2U, devices_.size()); | 48 ASSERT_EQ(2U, devices_.size()); |
49 | 49 |
50 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> connected = | 50 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> connected = |
51 devices_[0]->is_connected() ? devices_[0] : devices_[1]; | 51 devices_[0]->is_connected() ? devices_[0] : devices_[1]; |
52 | 52 |
53 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> not_connected = | 53 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> not_connected = |
54 devices_[0]->is_connected() ? devices_[1] : devices_[0]; | 54 devices_[0]->is_connected() ? devices_[1] : devices_[0]; |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 CheckDevices(); | 147 CheckDevices(); |
148 StopMockAdbServer(); | 148 StopMockAdbServer(); |
149 } | 149 } |
150 | 150 |
151 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestFlushWithData) { | 151 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestFlushWithData) { |
152 StartMockAdbServer(FlushWithData); | 152 StartMockAdbServer(FlushWithData); |
153 StartTest(); | 153 StartTest(); |
154 CheckDevices(); | 154 CheckDevices(); |
155 StopMockAdbServer(); | 155 StopMockAdbServer(); |
156 } | 156 } |
OLD | NEW |