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

Side by Side Diff: chrome/common/json_value_serializer_unittest.cc

Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | « chrome/common/json_value_serializer_perftest.cc ('k') | chrome/common/jstemplate_builder.cc » ('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) 2011 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/json/json_file_value_serializer.h"
7 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
8 #include "base/json/json_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
9 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
10 #include "base/path_service.h" 11 #include "base/path_service.h"
11 #include "base/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
12 #include "base/string16.h" 13 #include "base/string16.h"
13 #include "base/string_util.h" 14 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 16 #include "base/values.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
18 19
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 FilePath source_file_path; 330 FilePath source_file_path;
330 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path)); 331 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path));
331 source_file_path = source_file_path.Append( 332 source_file_path = source_file_path.Append(
332 FILE_PATH_LITERAL("serializer_test_nowhitespace.js")); 333 FILE_PATH_LITERAL("serializer_test_nowhitespace.js"));
333 ASSERT_TRUE(file_util::PathExists(source_file_path)); 334 ASSERT_TRUE(file_util::PathExists(source_file_path));
334 JSONFileValueSerializer serializer(source_file_path); 335 JSONFileValueSerializer serializer(source_file_path);
335 scoped_ptr<Value> root; 336 scoped_ptr<Value> root;
336 root.reset(serializer.Deserialize(NULL, NULL)); 337 root.reset(serializer.Deserialize(NULL, NULL));
337 ASSERT_TRUE(root.get()); 338 ASSERT_TRUE(root.get());
338 } 339 }
OLDNEW
« no previous file with comments | « chrome/common/json_value_serializer_perftest.cc ('k') | chrome/common/jstemplate_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698