Index: mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc |
diff --git a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc |
index 2638a9d1c55734b67d4f872ba770c4be858a1839..4157943c997350eeb2b7e600e78cd2ab659cae34 100644 |
--- a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc |
+++ b/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc |
@@ -13,7 +13,6 @@ |
#include "mojo/public/cpp/bindings/lib/fixed_buffer.h" |
#include "mojo/public/cpp/bindings/lib/serialization.h" |
#include "mojo/public/cpp/bindings/lib/validation_errors.h" |
-#include "mojo/public/cpp/bindings/string.h" |
#include "mojo/public/cpp/system/message_pipe.h" |
#include "mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h" |
#include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h" |
@@ -191,7 +190,7 @@ TEST_F(SerializationWarningTest, ArrayOfArraysOfHandles) { |
TEST_F(SerializationWarningTest, ArrayOfStrings) { |
using MojomType = ArrayDataView<StringDataView>; |
- Array<String> test_array(3); |
+ Array<std::string> test_array(3); |
for (size_t i = 0; i < test_array.size(); ++i) |
test_array[i] = "hello"; |
@@ -201,17 +200,7 @@ TEST_F(SerializationWarningTest, ArrayOfStrings) { |
mojo::internal::VALIDATION_ERROR_NONE, |
&validate_params_0); |
- test_array = Array<String>(3); |
yzshen1
2017/01/03 21:44:41
Please consider keeping this test case, using Arra
Sam McNally
2017/01/03 23:44:28
Done.
|
- for (size_t i = 0; i < test_array.size(); ++i) |
- test_array[i] = nullptr; |
- ContainerValidateParams validate_params_1( |
- 0, false, new ContainerValidateParams(0, false, nullptr)); |
- TestArrayWarning<MojomType>( |
- std::move(test_array), |
- mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER, |
- &validate_params_1); |
- |
- test_array = Array<String>(2); |
+ test_array = Array<std::string>(2); |
ContainerValidateParams validate_params_2( |
3, true, new ContainerValidateParams(0, false, nullptr)); |
TestArrayWarning<MojomType>( |