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

Side by Side Diff: components/storage_monitor/media_storage_util_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 <string> 5 #include <string>
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // Create mount point for the test device. 53 // Create mount point for the test device.
54 base::FilePath CreateMountPoint(bool create_dcim_dir) { 54 base::FilePath CreateMountPoint(bool create_dcim_dir) {
55 base::FilePath path(scoped_temp_dir_.path()); 55 base::FilePath path(scoped_temp_dir_.path());
56 if (create_dcim_dir) 56 if (create_dcim_dir)
57 path = path.Append(kDCIMDirectoryName); 57 path = path.Append(kDCIMDirectoryName);
58 if (!base::CreateDirectory(path)) 58 if (!base::CreateDirectory(path))
59 return base::FilePath(); 59 return base::FilePath();
60 return scoped_temp_dir_.path(); 60 return scoped_temp_dir_.path();
61 } 61 }
62 62
63 virtual void SetUp() OVERRIDE { 63 virtual void SetUp() override {
64 monitor_ = TestStorageMonitor::CreateAndInstall(); 64 monitor_ = TestStorageMonitor::CreateAndInstall();
65 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); 65 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
66 } 66 }
67 67
68 virtual void TearDown() OVERRIDE { 68 virtual void TearDown() override {
69 WaitForFileThread(); 69 WaitForFileThread();
70 TestStorageMonitor::Destroy(); 70 TestStorageMonitor::Destroy();
71 } 71 }
72 72
73 static void PostQuitToUIThread() { 73 static void PostQuitToUIThread() {
74 BrowserThread::PostTask(BrowserThread::UI, 74 BrowserThread::PostTask(BrowserThread::UI,
75 FROM_HERE, 75 FROM_HERE,
76 base::MessageLoop::QuitClosure()); 76 base::MessageLoop::QuitClosure());
77 } 77 }
78 78
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 event.Reset(); 147 event.Reset();
148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
149 base::Bind(&MediaStorageUtil::FilterAttachedDevices, 149 base::Bind(&MediaStorageUtil::FilterAttachedDevices,
150 base::Unretained(&devices), signal_event)); 150 base::Unretained(&devices), signal_event));
151 event.Wait(); 151 event.Wait();
152 152
153 EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end()); 153 EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end());
154 } 154 }
155 155
156 } // namespace storage_monitor 156 } // namespace storage_monitor
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698