Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: base/json/json_reader_unittest.cc

Issue 1538743002: Switch to standard integer types in base/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DEPS roll too Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/json/json_reader.h ('k') | base/json/json_string_value_serializer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_reader.h" 5 #include "base/json/json_reader.h"
6 6
7 #include <stddef.h>
8
7 #include "base/base_paths.h" 9 #include "base/base_paths.h"
8 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
9 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 14 #include "base/path_service.h"
12 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
13 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 17 #include "base/values.h"
15 #include "build/build_config.h" 18 #include "build/build_config.h"
16 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
17 20
18 namespace base { 21 namespace base {
19 22
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 650
648 TEST(JSONReaderTest, IllegalTrailingNull) { 651 TEST(JSONReaderTest, IllegalTrailingNull) {
649 const char json[] = { '"', 'n', 'u', 'l', 'l', '"', '\0' }; 652 const char json[] = { '"', 'n', 'u', 'l', 'l', '"', '\0' };
650 std::string json_string(json, sizeof(json)); 653 std::string json_string(json, sizeof(json));
651 JSONReader reader; 654 JSONReader reader;
652 EXPECT_FALSE(reader.ReadToValue(json_string)); 655 EXPECT_FALSE(reader.ReadToValue(json_string));
653 EXPECT_EQ(JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT, reader.error_code()); 656 EXPECT_EQ(JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT, reader.error_code());
654 } 657 }
655 658
656 } // namespace base 659 } // namespace base
OLDNEW
« no previous file with comments | « base/json/json_reader.h ('k') | base/json/json_string_value_serializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698