| 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/devtools/device/devtools_android_bridge.h" | 8 #include "chrome/browser/devtools/device/devtools_android_bridge.h" |
| 9 #include "chrome/browser/devtools/device/usb/android_usb_device.h" | 9 #include "chrome/browser/devtools/device/usb/android_usb_device.h" |
| 10 #include "chrome/browser/devtools/device/usb/usb_device_provider.h" | 10 #include "chrome/browser/devtools/device/usb/usb_device_provider.h" |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 void ScheduleDeviceCountRequest(const base::Closure& request) { | 590 void ScheduleDeviceCountRequest(const base::Closure& request) { |
| 591 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 591 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 592 scheduler_invoked_++; | 592 scheduler_invoked_++; |
| 593 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, request); | 593 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, request); |
| 594 } | 594 } |
| 595 | 595 |
| 596 virtual void SetUpService() { | 596 virtual void SetUpService() { |
| 597 UsbService::SetInstanceForTest(new MockUsbService()); | 597 UsbService::SetInstanceForTest(new MockUsbService()); |
| 598 } | 598 } |
| 599 | 599 |
| 600 virtual void CleanUpOnMainThread() OVERRIDE { | 600 virtual void TearDownOnMainThread() OVERRIDE { |
| 601 scoped_refptr<content::MessageLoopRunner> runner = | 601 scoped_refptr<content::MessageLoopRunner> runner = |
| 602 new content::MessageLoopRunner; | 602 new content::MessageLoopRunner; |
| 603 UsbService* service = NULL; | 603 UsbService* service = NULL; |
| 604 BrowserThread::PostTaskAndReply( | 604 BrowserThread::PostTaskAndReply( |
| 605 BrowserThread::FILE, | 605 BrowserThread::FILE, |
| 606 FROM_HERE, | 606 FROM_HERE, |
| 607 base::Bind(&UsbService::SetInstanceForTest, service), | 607 base::Bind(&UsbService::SetInstanceForTest, service), |
| 608 runner->QuitClosure()); | 608 runner->QuitClosure()); |
| 609 runner->Run(); | 609 runner->Run(); |
| 610 } | 610 } |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 runner_->Run(); | 834 runner_->Run(); |
| 835 EXPECT_EQ(2, listener.invoked_); | 835 EXPECT_EQ(2, listener.invoked_); |
| 836 EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_); | 836 EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_); |
| 837 } | 837 } |
| 838 | 838 |
| 839 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) { | 839 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) { |
| 840 MockCountListenerForCheckingTraits listener(adb_bridge_); | 840 MockCountListenerForCheckingTraits listener(adb_bridge_); |
| 841 adb_bridge_->AddDeviceCountListener(&listener); | 841 adb_bridge_->AddDeviceCountListener(&listener); |
| 842 runner_->Run(); | 842 runner_->Run(); |
| 843 } | 843 } |
| OLD | NEW |