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

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

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ Created 6 years, 2 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_value_converter.h ('k') | base/lazy_instance_unittest.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) 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 <string> 5 #include <string>
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]")); 365 root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]"));
366 ASSERT_FALSE(root.get()); 366 ASSERT_FALSE(root.get());
367 367
368 // Not a open comment token. 368 // Not a open comment token.
369 root.reset(JSONReader::Read("/ * * / [1]")); 369 root.reset(JSONReader::Read("/ * * / [1]"));
370 ASSERT_FALSE(root.get()); 370 ASSERT_FALSE(root.get());
371 } 371 }
372 372
373 class JSONFileValueSerializerTest : public testing::Test { 373 class JSONFileValueSerializerTest : public testing::Test {
374 protected: 374 protected:
375 virtual void SetUp() OVERRIDE { 375 virtual void SetUp() override {
376 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 376 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
377 } 377 }
378 378
379 base::ScopedTempDir temp_dir_; 379 base::ScopedTempDir temp_dir_;
380 }; 380 };
381 381
382 TEST_F(JSONFileValueSerializerTest, Roundtrip) { 382 TEST_F(JSONFileValueSerializerTest, Roundtrip) {
383 base::FilePath original_file_path; 383 base::FilePath original_file_path;
384 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &original_file_path)); 384 ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &original_file_path));
385 original_file_path = 385 original_file_path =
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ASSERT_TRUE(PathExists(source_file_path)); 462 ASSERT_TRUE(PathExists(source_file_path));
463 JSONFileValueSerializer serializer(source_file_path); 463 JSONFileValueSerializer serializer(source_file_path);
464 scoped_ptr<Value> root; 464 scoped_ptr<Value> root;
465 root.reset(serializer.Deserialize(NULL, NULL)); 465 root.reset(serializer.Deserialize(NULL, NULL));
466 ASSERT_TRUE(root.get()); 466 ASSERT_TRUE(root.get());
467 } 467 }
468 468
469 } // namespace 469 } // namespace
470 470
471 } // namespace base 471 } // namespace base
OLDNEW
« no previous file with comments | « base/json/json_value_converter.h ('k') | base/lazy_instance_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698