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

Side by Side Diff: device/test/run_all_unittests.cc

Issue 1514603006: Implement basic USB device enumeration on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android_usb_browsertest.cc. Created 5 years 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 unified diff | Download patch
OLDNEW
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/test/launcher/unit_test_launcher.h" 6 #include "base/test/launcher/unit_test_launcher.h"
7 #include "base/test/test_suite.h" 7 #include "base/test/test_suite.h"
8 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 8 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
9 9
10 #if defined(OS_ANDROID) 10 #if defined(OS_ANDROID)
11 #include "base/android/jni_android.h" 11 #include "base/android/jni_android.h"
12 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 12 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
13 #include "device/usb/android/usb_jni_registrar.h"
13 #endif 14 #endif
14 15
15 int main(int argc, char** argv) { 16 int main(int argc, char** argv) {
16 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
17 device::android::RegisterBluetoothJni(base::android::AttachCurrentThread()); 18 device::android::RegisterBluetoothJni(base::android::AttachCurrentThread());
19 device::android::RegisterUsbJni(base::android::AttachCurrentThread());
18 #endif 20 #endif
19 21
20 base::TestSuite test_suite(argc, argv); 22 base::TestSuite test_suite(argc, argv);
21 23
22 mojo::embedder::Init(); 24 mojo::embedder::Init();
23 return base::LaunchUnitTests( 25 return base::LaunchUnitTests(
24 argc, 26 argc,
25 argv, 27 argv,
26 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 28 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
27 } 29 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698