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

Side by Side Diff: chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h" 7 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_p rovider.h"
8 #include "chromeos/disks/mock_disk_mount_manager.h" 8 #include "chromeos/disks/mock_disk_mount_manager.h"
9 #include "content/public/test/test_browser_thread_bundle.h" 9 #include "content/public/test/test_browser_thread_bundle.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 13 matching lines...) Expand all
24 const char kVendorName[] = "Test Vendor"; 24 const char kVendorName[] = "Test Vendor";
25 const char kProductName[] = "Test Product"; 25 const char kProductName[] = "Test Product";
26 const uint64 kDeviceSize = 1024 * 1024 * 1024; 26 const uint64 kDeviceSize = 1024 * 1024 * 1024;
27 const bool kOnRemovableDevice = true; 27 const bool kOnRemovableDevice = true;
28 28
29 const char kUnknownSDDiskModel[] = "SD Card"; 29 const char kUnknownSDDiskModel[] = "SD Card";
30 const char kUnknownUSBDiskModel[] = "USB Drive"; 30 const char kUnknownUSBDiskModel[] = "USB Drive";
31 31
32 class RemovableStorageProviderChromeOsUnitTest : public testing::Test { 32 class RemovableStorageProviderChromeOsUnitTest : public testing::Test {
33 public: 33 public:
34 virtual void SetUp() OVERRIDE { 34 virtual void SetUp() override {
35 disk_mount_manager_mock_ = new MockDiskMountManager(); 35 disk_mount_manager_mock_ = new MockDiskMountManager();
36 DiskMountManager::InitializeForTesting(disk_mount_manager_mock_); 36 DiskMountManager::InitializeForTesting(disk_mount_manager_mock_);
37 disk_mount_manager_mock_->SetupDefaultReplies(); 37 disk_mount_manager_mock_->SetupDefaultReplies();
38 } 38 }
39 39
40 virtual void TearDown() OVERRIDE { DiskMountManager::Shutdown(); } 40 virtual void TearDown() override { DiskMountManager::Shutdown(); }
41 41
42 void DevicesCallback(scoped_refptr<StorageDeviceList> devices, bool success) { 42 void DevicesCallback(scoped_refptr<StorageDeviceList> devices, bool success) {
43 devices_ = devices; 43 devices_ = devices;
44 } 44 }
45 45
46 void CreateDisk(const std::string& device_path, 46 void CreateDisk(const std::string& device_path,
47 chromeos::DeviceType device_type, 47 chromeos::DeviceType device_type,
48 bool is_parent, 48 bool is_parent,
49 bool has_media, 49 bool has_media,
50 bool on_boot_device) { 50 bool on_boot_device) {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 ASSERT_EQ(2U, devices_->data.size()); 160 ASSERT_EQ(2U, devices_->data.size());
161 161
162 ExpectDevice( 162 ExpectDevice(
163 devices_.get(), kDevicePathUSB, "", kUnknownUSBDiskModel, kDeviceSize); 163 devices_.get(), kDevicePathUSB, "", kUnknownUSBDiskModel, kDeviceSize);
164 ExpectDevice( 164 ExpectDevice(
165 devices_.get(), kDevicePathSD, "", kUnknownSDDiskModel, kDeviceSize); 165 devices_.get(), kDevicePathSD, "", kUnknownSDDiskModel, kDeviceSize);
166 } 166 }
167 167
168 } // namespace extensions 168 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698