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

Side by Side Diff: chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/base64.h" 5 #include "base/base64.h"
6 #include "base/base_paths_win.h" 6 #include "base/base_paths_win.h"
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 22 matching lines...) Expand all
33 void TouchFile(const base::FilePath& file) { 33 void TouchFile(const base::FilePath& file) {
34 ASSERT_EQ(1, base::WriteFile(file, " ", 1)); 34 ASSERT_EQ(1, base::WriteFile(file, " ", 1));
35 } 35 }
36 36
37 class ITunesFinderWinTest : public InProcessBrowserTest { 37 class ITunesFinderWinTest : public InProcessBrowserTest {
38 public: 38 public:
39 ITunesFinderWinTest() : test_finder_callback_called_(false) {} 39 ITunesFinderWinTest() : test_finder_callback_called_(false) {}
40 40
41 virtual ~ITunesFinderWinTest() {} 41 virtual ~ITunesFinderWinTest() {}
42 42
43 virtual void SetUp() OVERRIDE { 43 virtual void SetUp() override {
44 ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir()); 44 ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir());
45 ASSERT_TRUE(music_dir_.CreateUniqueTempDir()); 45 ASSERT_TRUE(music_dir_.CreateUniqueTempDir());
46 app_data_dir_override_.reset( 46 app_data_dir_override_.reset(
47 new base::ScopedPathOverride(base::DIR_APP_DATA, app_data_dir())); 47 new base::ScopedPathOverride(base::DIR_APP_DATA, app_data_dir()));
48 music_dir_override_.reset( 48 music_dir_override_.reset(
49 new base::ScopedPathOverride(chrome::DIR_USER_MUSIC, music_dir())); 49 new base::ScopedPathOverride(chrome::DIR_USER_MUSIC, music_dir()));
50 InProcessBrowserTest::SetUp(); 50 InProcessBrowserTest::SetUp();
51 } 51 }
52 52
53 const base::FilePath& app_data_dir() { 53 const base::FilePath& app_data_dir() {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 "</plist>", EncodePath(library_xml).c_str()); 186 "</plist>", EncodePath(library_xml).c_str());
187 WritePrefFile(xml); 187 WritePrefFile(xml);
188 TestFindITunesLibrary(); 188 TestFindITunesLibrary();
189 EXPECT_TRUE(test_finder_callback_called()); 189 EXPECT_TRUE(test_finder_callback_called());
190 EXPECT_TRUE(EmptyResult()); 190 EXPECT_TRUE(EmptyResult());
191 } 191 }
192 192
193 } // namespace 193 } // namespace
194 194
195 } // namespace iapps 195 } // namespace iapps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698