base/json/json_reader_unittest.cc - Issue 468253002: Move file_util to base/files/ directory.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 468253002: Move file_util to base/files/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgot to add forwarding header to patch Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « base/json/json_file_value_serializer.cc ('k') | base/json/json_value_serializer_unittest.cc » ('j') | no next file with comments »

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_reader.h"	5 #include "base/json/json_reader.h"

6	6

7 #include "base/base_paths.h"	7 #include "base/base_paths.h"

8 #include "base/file_util.h"	8 #include "base/files/file_util.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/strings/string_piece.h"	12 #include "base/strings/string_piece.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "build/build_config.h"	15 #include "build/build_config.h"

16 #include "testing/gtest/include/gtest/gtest.h"	16 #include "testing/gtest/include/gtest/gtest.h"

17	17

18 namespace base {	18 namespace base {

(...skipping 628 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
647	647

648 TEST(JSONReaderTest, IllegalTrailingNull) {	648 TEST(JSONReaderTest, IllegalTrailingNull) {

649 const char json[] = { '"', 'n', 'u', 'l', 'l', '"', '\0' };	649 const char json[] = { '"', 'n', 'u', 'l', 'l', '"', '\0' };

650 std::string json_string(json, sizeof(json));	650 std::string json_string(json, sizeof(json));

651 JSONReader reader;	651 JSONReader reader;

652 EXPECT_FALSE(reader.ReadToValue(json_string));	652 EXPECT_FALSE(reader.ReadToValue(json_string));

653 EXPECT_EQ(JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT, reader.error_code());	653 EXPECT_EQ(JSONReader::JSON_UNEXPECTED_DATA_AFTER_ROOT, reader.error_code());

654 }	654 }

655	655

656 } // namespace base	656 } // namespace base

OLD	NEW