| 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 "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  | 
 |   9 #if defined(USE_CHROME_EDK) | 
 |  10 #include "mojo/edk/embedder/test_embedder.h" | 
 |  11 #else | 
|   8 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" |  12 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" | 
 |  13 #endif | 
|   9  |  14  | 
|  10 #if defined(OS_ANDROID) |  15 #if defined(OS_ANDROID) | 
|  11 #include "base/android/jni_android.h" |  16 #include "base/android/jni_android.h" | 
|  12 #include "device/bluetooth/android/bluetooth_jni_registrar.h" |  17 #include "device/bluetooth/android/bluetooth_jni_registrar.h" | 
|  13 #endif |  18 #endif | 
|  14  |  19  | 
|  15 int main(int argc, char** argv) { |  20 int main(int argc, char** argv) { | 
|  16 #if defined(OS_ANDROID) |  21 #if defined(OS_ANDROID) | 
|  17   device::android::RegisterBluetoothJni(base::android::AttachCurrentThread()); |  22   device::android::RegisterBluetoothJni(base::android::AttachCurrentThread()); | 
|  18 #endif |  23 #endif | 
|  19  |  24  | 
|  20   base::TestSuite test_suite(argc, argv); |  25   base::TestSuite test_suite(argc, argv); | 
|  21  |  26  | 
|  22   mojo::embedder::test::InitWithSimplePlatformSupport(); |  27   mojo::embedder::test::InitWithSimplePlatformSupport(); | 
|  23   return base::LaunchUnitTests( |  28   return base::LaunchUnitTests( | 
|  24       argc, |  29       argc, | 
|  25       argv, |  30       argv, | 
|  26       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |  31       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 
|  27 } |  32 } | 
| OLD | NEW |