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

Side by Side Diff: chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 19 matching lines...) Expand all
30 } 30 }
31 31
32 void TouchFile(const base::FilePath& file) { 32 void TouchFile(const base::FilePath& file) {
33 ASSERT_EQ(1, base::WriteFile(file, " ", 1)); 33 ASSERT_EQ(1, base::WriteFile(file, " ", 1));
34 } 34 }
35 35
36 class ITunesFinderWinTest : public InProcessBrowserTest { 36 class ITunesFinderWinTest : public InProcessBrowserTest {
37 public: 37 public:
38 ITunesFinderWinTest() : test_finder_callback_called_(false) {} 38 ITunesFinderWinTest() : test_finder_callback_called_(false) {}
39 39
40 virtual ~ITunesFinderWinTest() {} 40 ~ITunesFinderWinTest() override {}
41 41
42 virtual void SetUp() override { 42 void SetUp() override {
43 ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir()); 43 ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir());
44 ASSERT_TRUE(music_dir_.CreateUniqueTempDir()); 44 ASSERT_TRUE(music_dir_.CreateUniqueTempDir());
45 app_data_dir_override_.reset( 45 app_data_dir_override_.reset(
46 new base::ScopedPathOverride(base::DIR_APP_DATA, app_data_dir())); 46 new base::ScopedPathOverride(base::DIR_APP_DATA, app_data_dir()));
47 music_dir_override_.reset( 47 music_dir_override_.reset(
48 new base::ScopedPathOverride(chrome::DIR_USER_MUSIC, music_dir())); 48 new base::ScopedPathOverride(chrome::DIR_USER_MUSIC, music_dir()));
49 InProcessBrowserTest::SetUp(); 49 InProcessBrowserTest::SetUp();
50 } 50 }
51 51
52 const base::FilePath& app_data_dir() { 52 const base::FilePath& app_data_dir() {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 "</plist>", EncodePath(library_xml).c_str()); 185 "</plist>", EncodePath(library_xml).c_str());
186 WritePrefFile(xml); 186 WritePrefFile(xml);
187 TestFindITunesLibrary(); 187 TestFindITunesLibrary();
188 EXPECT_TRUE(test_finder_callback_called()); 188 EXPECT_TRUE(test_finder_callback_called());
189 EXPECT_TRUE(EmptyResult()); 189 EXPECT_TRUE(EmptyResult());
190 } 190 }
191 191
192 } // namespace 192 } // namespace
193 193
194 } // namespace iapps 194 } // namespace iapps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698