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

Side by Side Diff: chrome/browser/chromeos/file_manager/drive_test_util.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/chromeos/file_manager/drive_test_util.h" 5 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 8 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
9 9
10 namespace file_manager { 10 namespace file_manager {
11 namespace test_util { 11 namespace test_util {
12 12
13 namespace { 13 namespace {
14 14
15 // Helper class used to wait for |OnFileSystemMounted| event from a drive file 15 // Helper class used to wait for |OnFileSystemMounted| event from a drive file
16 // system. 16 // system.
17 class DriveMountPointWaiter : public drive::DriveIntegrationServiceObserver { 17 class DriveMountPointWaiter : public drive::DriveIntegrationServiceObserver {
18 public: 18 public:
19 explicit DriveMountPointWaiter( 19 explicit DriveMountPointWaiter(
20 drive::DriveIntegrationService* integration_service) 20 drive::DriveIntegrationService* integration_service)
21 : integration_service_(integration_service) { 21 : integration_service_(integration_service) {
22 integration_service_->AddObserver(this); 22 integration_service_->AddObserver(this);
23 } 23 }
24 24
25 virtual ~DriveMountPointWaiter() { 25 virtual ~DriveMountPointWaiter() {
26 integration_service_->RemoveObserver(this); 26 integration_service_->RemoveObserver(this);
27 } 27 }
28 28
29 // DriveIntegrationServiceObserver override. 29 // DriveIntegrationServiceObserver override.
30 virtual void OnFileSystemMounted() OVERRIDE { 30 virtual void OnFileSystemMounted() override {
31 // Note that it is OK for |run_loop_.Quit| to be called before 31 // Note that it is OK for |run_loop_.Quit| to be called before
32 // |run_loop_.Run|. In this case |Run| will return immediately. 32 // |run_loop_.Run|. In this case |Run| will return immediately.
33 run_loop_.Quit(); 33 run_loop_.Quit();
34 } 34 }
35 35
36 // Runs loop until the file system is mounted. 36 // Runs loop until the file system is mounted.
37 void Wait() { 37 void Wait() {
38 run_loop_.Run(); 38 run_loop_.Run();
39 } 39 }
40 40
(...skipping 23 matching lines...) Expand all
64 return; 64 return;
65 65
66 DriveMountPointWaiter mount_point_waiter(integration_service); 66 DriveMountPointWaiter mount_point_waiter(integration_service);
67 VLOG(1) << "Waiting for drive mount point to get mounted."; 67 VLOG(1) << "Waiting for drive mount point to get mounted.";
68 mount_point_waiter.Wait(); 68 mount_point_waiter.Wait();
69 VLOG(1) << "Drive mount point found."; 69 VLOG(1) << "Drive mount point found.";
70 } 70 }
71 71
72 } // namespace test_util 72 } // namespace test_util
73 } // namespace file_manager 73 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698