Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2715)

Unified Diff: chrome/browser/devtools/device/devtools_android_bridge.cc

Issue 278343002: Added device count test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index 5fefecc91fd06be14e3a306811c07f953321afba..9cb0e21ebe3932b6175902396f7391b17a227bc2 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -1198,7 +1198,8 @@ DevToolsAndroidBridge::HandlerThread::~HandlerThread() {
DevToolsAndroidBridge::DevToolsAndroidBridge(Profile* profile)
: profile_(profile),
- handler_thread_(HandlerThread::GetInstance()) {
+ handler_thread_(HandlerThread::GetInstance()),
+ polling_interval_for_test_(0) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
pref_change_registrar_.Init(profile_->GetPrefs());
pref_change_registrar_.Add(prefs::kDevToolsDiscoverUsbDevicesEnabled,
@@ -1305,7 +1306,9 @@ void DevToolsAndroidBridge::ReceivedDeviceList(RemoteDevices* devices_ptr) {
BrowserThread::UI,
FROM_HERE,
base::Bind(&DevToolsAndroidBridge::RequestDeviceList, this),
- base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs));
+ base::TimeDelta::FromMilliseconds(polling_interval_for_test_
+ ? polling_interval_for_test_
+ : kAdbPollingIntervalMs));
}
void DevToolsAndroidBridge::RequestDeviceCount() {
@@ -1333,7 +1336,9 @@ void DevToolsAndroidBridge::ReceivedDeviceCount(int count) {
BrowserThread::UI,
FROM_HERE,
base::Bind(&DevToolsAndroidBridge::RequestDeviceCount, this),
- base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs));
+ base::TimeDelta::FromMilliseconds(polling_interval_for_test_
+ ? polling_interval_for_test_
+ : kAdbPollingIntervalMs));
}
void DevToolsAndroidBridge::CreateDeviceProviders() {

Powered by Google App Engine
This is Rietveld 408576698