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

Side by Side Diff: chrome/browser/media_galleries/media_folder_finder_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/media_galleries/media_folder_finder.h" 5 #include "chrome/browser/media_galleries/media_folder_finder.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 10 matching lines...) Expand all
21 #include "content/public/test/test_utils.h" 21 #include "content/public/test/test_utils.h"
22 22
23 class MediaFolderFinderTest : public testing::Test { 23 class MediaFolderFinderTest : public testing::Test {
24 public: 24 public:
25 MediaFolderFinderTest() { 25 MediaFolderFinderTest() {
26 } 26 }
27 27
28 virtual ~MediaFolderFinderTest() { 28 virtual ~MediaFolderFinderTest() {
29 } 29 }
30 30
31 virtual void SetUp() OVERRIDE { 31 virtual void SetUp() override {
32 ASSERT_TRUE(fake_dir_.CreateUniqueTempDir()); 32 ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());
33 } 33 }
34 34
35 virtual void TearDown() OVERRIDE { 35 virtual void TearDown() override {
36 ASSERT_EQ(NULL, media_folder_finder_.get()); 36 ASSERT_EQ(NULL, media_folder_finder_.get());
37 } 37 }
38 38
39 protected: 39 protected:
40 void CreateMediaFolderFinder( 40 void CreateMediaFolderFinder(
41 const std::vector<base::FilePath> roots, 41 const std::vector<base::FilePath> roots,
42 bool expected_success, 42 bool expected_success,
43 const MediaFolderFinder::MediaFolderFinderResults& expected_results) { 43 const MediaFolderFinder::MediaFolderFinderResults& expected_results) {
44 EXPECT_EQ(NULL, media_folder_finder_.get()); 44 EXPECT_EQ(NULL, media_folder_finder_.get());
45 received_results_ = false; 45 received_results_ = false;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 396
397 // |fake_home_dir| and its ancestors do not show up in results. 397 // |fake_home_dir| and its ancestors do not show up in results.
398 expected_results.erase(fake_dir()); 398 expected_results.erase(fake_dir());
399 expected_results.erase(fake_home_dir); 399 expected_results.erase(fake_home_dir);
400 400
401 CreateMediaFolderFinder(folders, true, expected_results); 401 CreateMediaFolderFinder(folders, true, expected_results);
402 StartScan(); 402 StartScan();
403 RunLoopUntilReceivedCallback(); 403 RunLoopUntilReceivedCallback();
404 DeleteMediaFolderFinder(); 404 DeleteMediaFolderFinder();
405 } 405 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698