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

Side by Side Diff: base/files/file_path_unittest.cc

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process 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
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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "testing/platform_test.h" 9 #include "testing/platform_test.h"
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 struct UTF8TestData { 44 struct UTF8TestData {
45 const FilePath::CharType* native; 45 const FilePath::CharType* native;
46 const char* utf8; 46 const char* utf8;
47 }; 47 };
48 48
49 // file_util winds up using autoreleased objects on the Mac, so this needs 49 // file_util winds up using autoreleased objects on the Mac, so this needs
50 // to be a PlatformTest 50 // to be a PlatformTest
51 class FilePathTest : public PlatformTest { 51 class FilePathTest : public PlatformTest {
52 protected: 52 protected:
53 virtual void SetUp() OVERRIDE { 53 void SetUp() override { PlatformTest::SetUp(); }
pauljensen 2014/10/05 02:59:36 Do we want to be reformatting like this?
Mostyn Bramley-Moore 2014/10/05 07:26:31 No- after earlier discussion in this CL, we chose
54 PlatformTest::SetUp(); 54 void TearDown() override { PlatformTest::TearDown(); }
55 }
56 virtual void TearDown() OVERRIDE {
57 PlatformTest::TearDown();
58 }
59 }; 55 };
60 56
61 TEST_F(FilePathTest, DirName) { 57 TEST_F(FilePathTest, DirName) {
62 const struct UnaryTestData cases[] = { 58 const struct UnaryTestData cases[] = {
63 { FPL(""), FPL(".") }, 59 { FPL(""), FPL(".") },
64 { FPL("aa"), FPL(".") }, 60 { FPL("aa"), FPL(".") },
65 { FPL("/aa/bb"), FPL("/aa") }, 61 { FPL("/aa/bb"), FPL("/aa") },
66 { FPL("/aa/bb/"), FPL("/aa") }, 62 { FPL("/aa/bb/"), FPL("/aa") },
67 { FPL("/aa/bb//"), FPL("/aa") }, 63 { FPL("/aa/bb//"), FPL("/aa") },
68 { FPL("/aa/bb/ccc"), FPL("/aa/bb") }, 64 { FPL("/aa/bb/ccc"), FPL("/aa/bb") },
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 for (size_t i = 0; i < arraysize(cases); ++i) { 1270 for (size_t i = 0; i < arraysize(cases); ++i) {
1275 FilePath input(cases[i].input); 1271 FilePath input(cases[i].input);
1276 bool observed = input.IsContentUri(); 1272 bool observed = input.IsContentUri();
1277 EXPECT_EQ(cases[i].expected, observed) << 1273 EXPECT_EQ(cases[i].expected, observed) <<
1278 "i: " << i << ", input: " << input.value(); 1274 "i: " << i << ", input: " << input.value();
1279 } 1275 }
1280 } 1276 }
1281 #endif 1277 #endif
1282 1278
1283 } // namespace base 1279 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698