| 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/test/values_test_util.h" | 5 #include "base/test/values_test_util.h" |
| 6 | 6 |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 12 |
| 13 namespace base { | 13 namespace base { |
| 14 | 14 |
| 15 void ExpectDictBooleanValue(bool expected_value, | 15 void ExpectDictBooleanValue(bool expected_value, |
| 16 const DictionaryValue& value, | 16 const DictionaryValue& value, |
| 17 const std::string& key) { | 17 const std::string& key) { |
| 18 bool boolean_value = false; | 18 bool boolean_value = false; |
| 19 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; | 19 EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 NULL, &error_msg)); | 69 NULL, &error_msg)); |
| 70 if (!result) { | 70 if (!result) { |
| 71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; | 71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; |
| 72 result.reset(Value::CreateNullValue()); | 72 result.reset(Value::CreateNullValue()); |
| 73 } | 73 } |
| 74 return result.Pass(); | 74 return result.Pass(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace test | 77 } // namespace test |
| 78 } // namespace base | 78 } // namespace base |
| OLD | NEW |