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 "mojo/android/javatests/validation_test_util.h" | 5 #include "mojo/android/javatests/validation_test_util.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "base/test/test_support_android.h" | 10 #include "base/test/test_support_android.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 std::vector<uint8_t> data; | 24 std::vector<uint8_t> data; |
25 size_t num_handles; | 25 size_t num_handles; |
26 std::string error_message; | 26 std::string error_message; |
27 if (!test::ParseValidationTestInput( | 27 if (!test::ParseValidationTestInput( |
28 input, &data, &num_handles, &error_message)) { | 28 input, &data, &num_handles, &error_message)) { |
29 ScopedJavaLocalRef<jstring> j_error_message = | 29 ScopedJavaLocalRef<jstring> j_error_message = |
30 base::android::ConvertUTF8ToJavaString(env, error_message); | 30 base::android::ConvertUTF8ToJavaString(env, error_message); |
31 return Java_ValidationTestUtil_buildData( | 31 return Java_ValidationTestUtil_buildData( |
32 env, NULL, 0, j_error_message.obj()).Release(); | 32 env, NULL, 0, j_error_message.obj()).Release(); |
33 } | 33 } |
34 | 34 void* data_ptr = &data[0]; |
| 35 if (!data_ptr) { |
| 36 DCHECK(!data.size()); |
| 37 data_ptr = &data; |
| 38 } |
35 jobject byte_buffer = | 39 jobject byte_buffer = |
36 env->NewDirectByteBuffer(&data[0], data.size()); | 40 env->NewDirectByteBuffer(data_ptr, data.size()); |
37 return Java_ValidationTestUtil_buildData(env, byte_buffer, num_handles, NULL) | 41 return Java_ValidationTestUtil_buildData(env, byte_buffer, num_handles, NULL) |
38 .Release(); | 42 .Release(); |
39 } | 43 } |
40 | 44 |
41 } // namespace android | 45 } // namespace android |
42 } // namespace mojo | 46 } // namespace mojo |
OLD | NEW |