| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/json/json_value_converter.h" | 5 #include "base/json/json_value_converter.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 enum SimpleEnum { | 22 enum SimpleEnum { |
| 23 FOO, BAR, | 23 FOO, BAR, |
| 24 }; | 24 }; |
| 25 int foo; | 25 int foo; |
| 26 std::string bar; | 26 std::string bar; |
| 27 bool baz; | 27 bool baz; |
| 28 bool bstruct; | 28 bool bstruct; |
| 29 SimpleEnum simple_enum; | 29 SimpleEnum simple_enum; |
| 30 ScopedVector<int> ints; | 30 ScopedVector<int> ints; |
| 31 ScopedVector<std::string> string_values; | 31 ScopedVector<std::string> string_values; |
| 32 SimpleMessage() : foo(0), baz(false), bstruct(false) {} | 32 SimpleMessage() : foo(0), baz(false), bstruct(false), simple_enum(FOO) {} |
| 33 | 33 |
| 34 static bool ParseSimpleEnum(const StringPiece& value, SimpleEnum* field) { | 34 static bool ParseSimpleEnum(const StringPiece& value, SimpleEnum* field) { |
| 35 if (value == "foo") { | 35 if (value == "foo") { |
| 36 *field = FOO; | 36 *field = FOO; |
| 37 return true; | 37 return true; |
| 38 } else if (value == "bar") { | 38 } else if (value == "bar") { |
| 39 *field = BAR; | 39 *field = BAR; |
| 40 return true; | 40 return true; |
| 41 } | 41 } |
| 42 return false; | 42 return false; |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 "}\n"; | 247 "}\n"; |
| 248 | 248 |
| 249 scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); | 249 scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); |
| 250 SimpleMessage message; | 250 SimpleMessage message; |
| 251 base::JSONValueConverter<SimpleMessage> converter; | 251 base::JSONValueConverter<SimpleMessage> converter; |
| 252 EXPECT_FALSE(converter.Convert(*value.get(), &message)); | 252 EXPECT_FALSE(converter.Convert(*value.get(), &message)); |
| 253 // No check the values as mentioned above. | 253 // No check the values as mentioned above. |
| 254 } | 254 } |
| 255 | 255 |
| 256 } // namespace base | 256 } // namespace base |
| OLD | NEW |