Chromium Code Reviews| Index: net/base/directory_lister_unittest.cc |
| diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc |
| index f52e23e3bd60c9fe1684ca8175723941c9bb9c63..966b75276544461f01e6e7e324c42ab34284ab29 100644 |
| --- a/net/base/directory_lister_unittest.cc |
| +++ b/net/base/directory_lister_unittest.cc |
| @@ -20,12 +20,10 @@ namespace net { |
| class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { |
| public: |
| - ListerDelegate(bool recursive, |
| - bool quit_loop_after_each_file) |
| + ListerDelegate(bool recursive, bool quit_loop_after_each_file) |
| : error_(-1), |
| recursive_(recursive), |
| - quit_loop_after_each_file_(quit_loop_after_each_file) { |
| - } |
| + quit_loop_after_each_file_(quit_loop_after_each_file) {} |
| virtual void OnListFile( |
| const DirectoryLister::DirectoryListerData& data) override { |
| @@ -47,11 +45,10 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { |
| void CheckRecursiveSort() { |
| // Check that we got files in the right order. |
| if (!file_list_.empty()) { |
| - for (size_t previous = 0, current = 1; |
| - current < file_list_.size(); |
| + for (size_t previous = 0, current = 1; current < file_list_.size(); |
|
davidben
2014/10/10 20:24:15
I feel like the old one here is slightly clearer,
|
| previous++, current++) { |
| - EXPECT_TRUE(base::i18n::LocaleAwareCompareFilenames( |
| - paths_[previous], paths_[current])); |
| + EXPECT_TRUE(base::i18n::LocaleAwareCompareFilenames(paths_[previous], |
| + paths_[current])); |
| } |
| } |
| } |
| @@ -59,8 +56,7 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { |
| void CheckSort() { |
| // Check that we got files in the right order. |
| if (!file_list_.empty()) { |
| - for (size_t previous = 0, current = 1; |
| - current < file_list_.size(); |
| + for (size_t previous = 0, current = 1; current < file_list_.size(); |
| previous++, current++) { |
| // Directories should come before files. |
| if (file_list_[previous].IsDirectory() && |
| @@ -72,8 +68,7 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { |
| EXPECT_EQ(file_list_[previous].IsDirectory(), |
| file_list_[current].IsDirectory()); |
| EXPECT_TRUE(base::i18n::LocaleAwareCompareFilenames( |
| - file_list_[previous].GetName(), |
| - file_list_[current].GetName())); |
| + file_list_[previous].GetName(), file_list_[current].GetName())); |
| } |
| } |
| } |
| @@ -92,7 +87,6 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { |
| class DirectoryListerTest : public PlatformTest { |
| public: |
| - |
| virtual void SetUp() override { |
| const int kMaxDepth = 3; |
| const int kBranchingFactor = 4; |
| @@ -125,9 +119,7 @@ class DirectoryListerTest : public PlatformTest { |
| PlatformTest::SetUp(); |
| } |
| - const base::FilePath& root_path() const { |
| - return temp_root_dir_.path(); |
| - } |
| + const base::FilePath& root_path() const { return temp_root_dir_.path(); } |
| private: |
| base::ScopedTempDir temp_root_dir_; |
| @@ -145,8 +137,8 @@ TEST_F(DirectoryListerTest, BigDirTest) { |
| TEST_F(DirectoryListerTest, BigDirRecursiveTest) { |
| ListerDelegate delegate(true, false); |
| - DirectoryLister lister(root_path(), true, DirectoryLister::FULL_PATH, |
| - &delegate); |
| + DirectoryLister lister( |
| + root_path(), true, DirectoryLister::FULL_PATH, &delegate); |
| lister.Start(); |
| base::MessageLoop::current()->Run(); |