diff options
Diffstat (limited to 'chrome/browser/extensions/api/image_writer_private')
13 files changed, 39 insertions, 39 deletions
diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h index 1ad44b7..7d9a026 100644 --- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h @@ -20,7 +20,7 @@ class DestroyPartitionsOperation : public Operation { DestroyPartitionsOperation(base::WeakPtr<OperationManager> manager, const ExtensionId& extension_id, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; private: virtual ~DestroyPartitionsOperation(); diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h index 56ee446..e55150c 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.h @@ -19,7 +19,7 @@ class ImageWriterPrivateWriteFromUrlFunction private: virtual ~ImageWriterPrivateWriteFromUrlFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteStarted(bool success, const std::string& error); }; @@ -32,7 +32,7 @@ class ImageWriterPrivateWriteFromFileFunction private: virtual ~ImageWriterPrivateWriteFromFileFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteStarted(bool success, const std::string& error); }; @@ -45,7 +45,7 @@ class ImageWriterPrivateCancelWriteFunction private: virtual ~ImageWriterPrivateCancelWriteFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnWriteCancelled(bool success, const std::string& error); }; @@ -58,7 +58,7 @@ class ImageWriterPrivateDestroyPartitionsFunction private: virtual ~ImageWriterPrivateDestroyPartitionsFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnDestroyComplete(bool success, const std::string& error); }; @@ -71,7 +71,7 @@ class ImageWriterPrivateListRemovableStorageDevicesFunction private: virtual ~ImageWriterPrivateListRemovableStorageDevicesFunction(); - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void OnDeviceListReady(scoped_refptr<StorageDeviceList> device_list, bool success); }; diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc index f30c38cc..9ba749a 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc @@ -18,7 +18,7 @@ using extensions::image_writer::FakeImageWriterClient; class ImageWriterPrivateApiTest : public ExtensionApiTest { public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); test_utils_.SetUp(true); @@ -61,7 +61,7 @@ class ImageWriterPrivateApiTest : public ExtensionApiTest { RemovableStorageProvider::SetDeviceListForTesting(device_list); } - virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { + virtual void TearDownInProcessBrowserTestFixture() override { ExtensionApiTest::TearDownInProcessBrowserTestFixture(); test_utils_.TearDown(); RemovableStorageProvider::ClearDeviceListForTesting(); diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h index 81408ff..215a77d 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h @@ -61,9 +61,9 @@ class ImageWriterUtilityClient : public content::UtilityProcessHostClient { void StartHost(); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual void OnProcessLaunchFailed() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual void OnProcessLaunchFailed() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; virtual bool Send(IPC::Message* msg); // IPC message handlers. diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h index 8d9208f..95ebfeb 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h @@ -49,7 +49,7 @@ class OperationManager : public BrowserContextKeyedAPI, explicit OperationManager(content::BrowserContext* context); virtual ~OperationManager(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Starts a WriteFromUrl operation. void StartWriteFromUrl(const ExtensionId& extension_id, @@ -99,13 +99,13 @@ class OperationManager : public BrowserContextKeyedAPI, // NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; Operation* GetOperation(const ExtensionId& extension_id); void DeleteOperation(const ExtensionId& extension_id); diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc index 3bd5200..243048f 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc @@ -29,7 +29,7 @@ class FakeEventRouter : public extensions::EventRouter { virtual void DispatchEventToExtension( const std::string& extension_id, - scoped_ptr<extensions::Event> event) OVERRIDE { + scoped_ptr<extensions::Event> event) override { // Do nothing with the event as no tests currently care. } }; @@ -42,7 +42,7 @@ class FakeExtensionSystem : public extensions::TestExtensionSystem { fake_event_router_.reset(new FakeEventRouter(profile)); } - virtual EventRouter* event_router() OVERRIDE { + virtual EventRouter* event_router() override { return fake_event_router_.get(); } @@ -77,7 +77,7 @@ class ImageWriterOperationManagerTest : public ImageWriterUnitTestBase { start_success_(false) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); extension_system_ = static_cast<FakeExtensionSystem*>( ExtensionSystemFactory::GetInstance()-> diff --git a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc index 9dc7c0c..e293236 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc @@ -37,7 +37,7 @@ class OperationForTest : public Operation { const std::string& device_path) : Operation(manager_, extension_id, device_path) {} - virtual void StartImpl() OVERRIDE {} + virtual void StartImpl() override {} // Expose internal stages for testing. void Unzip(const base::Closure& continuation) { @@ -67,7 +67,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { protected: ImageWriterOperationTest() : profile_(new TestingProfile), manager_(profile_.get()) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); // Create the zip file. @@ -88,7 +88,7 @@ class ImageWriterOperationTest : public ImageWriterUnitTestBase { operation_->SetImagePath(test_utils_.GetImagePath()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Ensure all callbacks have been destroyed and cleanup occurs. operation_->Cancel(); diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc index a498178..d4de7d9 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc @@ -31,13 +31,13 @@ const char kUnknownUSBDiskModel[] = "USB Drive"; class RemovableStorageProviderChromeOsUnitTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { disk_mount_manager_mock_ = new MockDiskMountManager(); DiskMountManager::InitializeForTesting(disk_mount_manager_mock_); disk_mount_manager_mock_->SetupDefaultReplies(); } - virtual void TearDown() OVERRIDE { DiskMountManager::Shutdown(); } + virtual void TearDown() override { DiskMountManager::Shutdown(); } void DevicesCallback(scoped_refptr<StorageDeviceList> devices, bool success) { devices_ = devices; diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc index 5cae145..7ef5bee 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc @@ -23,14 +23,14 @@ class ImageWriterFakeImageBurnerClient virtual void SetEventHandlers( const BurnFinishedHandler& burn_finished_handler, - const BurnProgressUpdateHandler& burn_progress_update_handler) OVERRIDE { + const BurnProgressUpdateHandler& burn_progress_update_handler) override { burn_finished_handler_ = burn_finished_handler; burn_progress_update_handler_ = burn_progress_update_handler; } virtual void BurnImage(const std::string& from_path, const std::string& to_path, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(burn_progress_update_handler_, to_path, 0, 100)); base::MessageLoop::current()->PostTask(FROM_HERE, diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.h b/chrome/browser/extensions/api/image_writer_private/test_utils.h index 9564602..b4b7e7c6 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.h +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.h @@ -64,7 +64,7 @@ class FakeDiskMountManager : public chromeos::disks::MockDiskMountManager { virtual void UnmountDeviceRecursively( const std::string& device_path, - const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE; + const UnmountDeviceRecursivelyCallbackType& callback) override; private: DiskMap disks_; @@ -79,17 +79,17 @@ class FakeImageWriterClient : public ImageWriterUtilityClient { const SuccessCallback& success_callback, const ErrorCallback& error_callback, const base::FilePath& source, - const base::FilePath& target) OVERRIDE; + const base::FilePath& target) override; virtual void Verify(const ProgressCallback& progress_callback, const SuccessCallback& success_callback, const ErrorCallback& error_callback, const base::FilePath& source, - const base::FilePath& target) OVERRIDE; + const base::FilePath& target) override; - virtual void Cancel(const CancelCallback& cancel_callback) OVERRIDE; + virtual void Cancel(const CancelCallback& cancel_callback) override; - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // Sets a callback for when a Write call is made. void SetWriteCallback(const base::Closure& write_callback); @@ -169,8 +169,8 @@ class ImageWriterUnitTestBase : public testing::Test { ImageWriterUnitTestBase(); virtual ~ImageWriterUnitTestBase(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; ImageWriterTestUtils test_utils_; diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h index 312fd8e..49ea47a 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h @@ -17,7 +17,7 @@ class WriteFromFileOperation : public Operation { const ExtensionId& extension_id, const base::FilePath& user_file_path, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; private: virtual ~WriteFromFileOperation(); diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h index 2668321..0b7ac73d 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h @@ -28,7 +28,7 @@ class WriteFromUrlOperation : public Operation, public net::URLFetcherDelegate { GURL url, const std::string& hash, const std::string& storage_unit_id); - virtual void StartImpl() OVERRIDE; + virtual void StartImpl() override; protected: virtual ~WriteFromUrlOperation(); @@ -51,13 +51,13 @@ class WriteFromUrlOperation : public Operation, public net::URLFetcherDelegate { void DestroyUrlFetcher(); // URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source, int64 current, - int64 total) OVERRIDE; + int64 total) override; virtual void OnURLFetchUploadProgress(const net::URLFetcher* source, int64 current, - int64 total) OVERRIDE; + int64 total) override; void VerifyDownloadCompare(const base::Closure& continuation, const std::string& download_hash); diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc index 7be001c..815be78 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc @@ -43,7 +43,7 @@ class OperationForTest : public WriteFromUrlOperation { hash, storage_unit_id) {} - virtual void StartImpl() OVERRIDE {} + virtual void StartImpl() override {} // Expose stages for testing. void GetDownloadTarget(const base::Closure& continuation) { @@ -73,7 +73,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { protected: ImageWriterWriteFromUrlOperationTest() : manager_(&test_profile_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ImageWriterUnitTestBase::SetUp(); // Turn on interception and set up our dummy file. @@ -86,7 +86,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { test_utils_.GetImagePath()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ImageWriterUnitTestBase::TearDown(); // Remember to turn off global interception. |