diff options
143 files changed, 646 insertions, 646 deletions
diff --git a/content/browser/bootstrap_sandbox_mac.cc b/content/browser/bootstrap_sandbox_mac.cc index 347114a..9c88cf6 100644 --- a/content/browser/bootstrap_sandbox_mac.cc +++ b/content/browser/bootstrap_sandbox_mac.cc @@ -30,9 +30,9 @@ class BootstrapSandboxPolicy : public BrowserChildProcessObserver { // BrowserChildProcessObserver: virtual void BrowserChildProcessHostDisconnected( - const ChildProcessData& data) OVERRIDE; + const ChildProcessData& data) override; virtual void BrowserChildProcessCrashed( - const ChildProcessData& data) OVERRIDE; + const ChildProcessData& data) override; private: friend struct DefaultSingletonTraits<BootstrapSandboxPolicy>; diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h index b196551..bce1832 100644 --- a/content/browser/browser_child_process_host_impl.h +++ b/content/browser/browser_child_process_host_impl.h @@ -45,25 +45,25 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl static void TerminateAll(); // BrowserChildProcessHost implementation: - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; virtual void Launch( SandboxedProcessLauncherDelegate* delegate, - base::CommandLine* cmd_line) OVERRIDE; - virtual const ChildProcessData& GetData() const OVERRIDE; - virtual ChildProcessHost* GetHost() const OVERRIDE; + base::CommandLine* cmd_line) override; + virtual const ChildProcessData& GetData() const override; + virtual ChildProcessHost* GetHost() const override; virtual base::TerminationStatus GetTerminationStatus( - bool known_dead, int* exit_code) OVERRIDE; - virtual void SetName(const base::string16& name) OVERRIDE; - virtual void SetHandle(base::ProcessHandle handle) OVERRIDE; + bool known_dead, int* exit_code) override; + virtual void SetName(const base::string16& name) override; + virtual void SetHandle(base::ProcessHandle handle) override; // ChildProcessHostDelegate implementation: - virtual bool CanShutdown() OVERRIDE; - virtual void OnChildDisconnected() OVERRIDE; - virtual base::ProcessHandle GetHandle() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; - virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool CanShutdown() override; + virtual void OnChildDisconnected() override; + virtual base::ProcessHandle GetHandle() const override; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; + virtual void OnBadMessageReceived(const IPC::Message& message) override; // Removes this host from the host list. Calls ChildProcessHost::ForceShutdown void ForceShutdown(); @@ -96,8 +96,8 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl static void RemoveObserver(BrowserChildProcessObserver* observer); // ChildProcessLauncher::Client implementation. - virtual void OnProcessLaunched() OVERRIDE; - virtual void OnProcessLaunchFailed() OVERRIDE; + virtual void OnProcessLaunched() override; + virtual void OnProcessLaunchFailed() override; #if defined(OS_WIN) void DeleteProcessWaitableEvent(base::WaitableEvent* event); diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index e9c1391..424a8ae 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -318,10 +318,10 @@ class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver { MemoryObserver() {} virtual ~MemoryObserver() {} - virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void WillProcessTask(const base::PendingTask& pending_task) override { } - virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void DidProcessTask(const base::PendingTask& pending_task) override { #if !defined(OS_IOS) // No ProcessMetrics on IOS. scoped_ptr<base::ProcessMetrics> process_metrics( base::ProcessMetrics::CreateProcessMetrics( diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index 7acd62d..80869f3 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -124,7 +124,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { Shutdown(); } - virtual int Initialize(const MainFunctionParams& parameters) OVERRIDE { + virtual int Initialize(const MainFunctionParams& parameters) override { TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize"); // On Android we normally initialize the browser in a series of UI thread // tasks. While this is happening a second request can come from the OS or @@ -199,14 +199,14 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { return -1; } - virtual int Run() OVERRIDE { + virtual int Run() override { DCHECK(initialization_started_); DCHECK(!is_shutdown_); main_loop_->RunMainMessageLoopParts(); return main_loop_->GetResultCode(); } - virtual void Shutdown() OVERRIDE { + virtual void Shutdown() override { DCHECK(initialization_started_); DCHECK(!is_shutdown_); #ifdef LEAK_SANITIZER diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h index e006388..888db2d 100644 --- a/content/browser/browser_process_sub_thread.h +++ b/content/browser/browser_process_sub_thread.h @@ -38,8 +38,8 @@ class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThreadImpl { virtual ~BrowserProcessSubThread(); protected: - virtual void Init() OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void CleanUp() override; private: // These methods encapsulate cleanup that needs to happen on the IO thread diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc index 0331f03..cec1477 100644 --- a/content/browser/browser_thread_impl.cc +++ b/content/browser/browser_thread_impl.cc @@ -47,19 +47,19 @@ class BrowserThreadMessageLoopProxy : public base::MessageLoopProxy { // MessageLoopProxy implementation. virtual bool PostDelayedTask( const tracked_objects::Location& from_here, - const base::Closure& task, base::TimeDelta delay) OVERRIDE { + const base::Closure& task, base::TimeDelta delay) override { return BrowserThread::PostDelayedTask(id_, from_here, task, delay); } virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { return BrowserThread::PostNonNestableDelayedTask(id_, from_here, task, delay); } - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { + virtual bool RunsTasksOnCurrentThread() const override { return BrowserThread::CurrentlyOn(id_); } diff --git a/content/browser/browser_thread_impl.h b/content/browser/browser_thread_impl.h index 1a6d75b..fca4379f 100644 --- a/content/browser/browser_thread_impl.h +++ b/content/browser/browser_thread_impl.h @@ -28,9 +28,9 @@ class CONTENT_EXPORT BrowserThreadImpl : public BrowserThread, static void ShutdownThreadPool(); protected: - virtual void Init() OVERRIDE; - virtual void Run(base::MessageLoop* message_loop) OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void Run(base::MessageLoop* message_loop) override; + virtual void CleanUp() override; private: // We implement all the functionality of the public BrowserThread diff --git a/content/browser/browser_url_handler_impl.h b/content/browser/browser_url_handler_impl.h index d0a1504..95dab97 100644 --- a/content/browser/browser_url_handler_impl.h +++ b/content/browser/browser_url_handler_impl.h @@ -25,10 +25,10 @@ class CONTENT_EXPORT BrowserURLHandlerImpl : public BrowserURLHandler { // BrowserURLHandler implementation: virtual void RewriteURLIfNecessary(GURL* url, BrowserContext* browser_context, - bool* reverse_on_redirect) OVERRIDE; + bool* reverse_on_redirect) override; // Add the specified handler pair to the list of URL handlers. virtual void AddHandlerPair(URLHandler handler, - URLHandler reverse_handler) OVERRIDE; + URLHandler reverse_handler) override; // Reverses the rewriting that was done for |original| using the new |url|. bool ReverseURLRewrite(GURL* url, const GURL& original, diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index 0cd3cd8..669f378 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc @@ -57,11 +57,11 @@ class ByteStreamWriterImpl : public ByteStreamWriter { // Overridden from ByteStreamWriter. virtual bool Write(scoped_refptr<net::IOBuffer> buffer, - size_t byte_count) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual void Close(int status) OVERRIDE; - virtual void RegisterCallback(const base::Closure& source_callback) OVERRIDE; - virtual size_t GetTotalBufferedBytes() const OVERRIDE; + size_t byte_count) override; + virtual void Flush() override; + virtual void Close(int status) override; + virtual void RegisterCallback(const base::Closure& source_callback) override; + virtual size_t GetTotalBufferedBytes() const override; // PostTask target from |ByteStreamReaderImpl::MaybeUpdateInput|. static void UpdateWindow(scoped_refptr<LifetimeFlag> lifetime_flag, @@ -117,9 +117,9 @@ class ByteStreamReaderImpl : public ByteStreamReader { // Overridden from ByteStreamReader. virtual StreamState Read(scoped_refptr<net::IOBuffer>* data, - size_t* length) OVERRIDE; - virtual int GetStatus() const OVERRIDE; - virtual void RegisterCallback(const base::Closure& sink_callback) OVERRIDE; + size_t* length) override; + virtual int GetStatus() const override; + virtual void RegisterCallback(const base::Closure& sink_callback) override; // PostTask target from |ByteStreamWriterImpl::Write| and // |ByteStreamWriterImpl::Close|. diff --git a/content/browser/cert_store_impl.h b/content/browser/cert_store_impl.h index cba8720..aa8786d 100644 --- a/content/browser/cert_store_impl.h +++ b/content/browser/cert_store_impl.h @@ -19,9 +19,9 @@ class CertStoreImpl : public CertStore { // CertStore implementation: virtual int StoreCert(net::X509Certificate* cert, - int render_process_host_id) OVERRIDE; + int render_process_host_id) override; virtual bool RetrieveCert(int cert_id, - scoped_refptr<net::X509Certificate>* cert) OVERRIDE; + scoped_refptr<net::X509Certificate>* cert) override; protected: CertStoreImpl(); diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h index 92c5f3d..d0a172d 100644 --- a/content/browser/child_process_security_policy_impl.h +++ b/content/browser/child_process_security_policy_impl.h @@ -40,47 +40,47 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl static ChildProcessSecurityPolicyImpl* GetInstance(); // ChildProcessSecurityPolicy implementation. - virtual void RegisterWebSafeScheme(const std::string& scheme) OVERRIDE; - virtual bool IsWebSafeScheme(const std::string& scheme) OVERRIDE; - virtual void GrantReadFile(int child_id, const base::FilePath& file) OVERRIDE; + virtual void RegisterWebSafeScheme(const std::string& scheme) override; + virtual bool IsWebSafeScheme(const std::string& scheme) override; + virtual void GrantReadFile(int child_id, const base::FilePath& file) override; virtual void GrantCreateReadWriteFile(int child_id, - const base::FilePath& file) OVERRIDE; - virtual void GrantCopyInto(int child_id, const base::FilePath& dir) OVERRIDE; + const base::FilePath& file) override; + virtual void GrantCopyInto(int child_id, const base::FilePath& dir) override; virtual void GrantDeleteFrom(int child_id, - const base::FilePath& dir) OVERRIDE; + const base::FilePath& dir) override; virtual void GrantReadFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual void GrantWriteFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual void GrantCreateFileForFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual void GrantCreateReadWriteFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual void GrantCopyIntoFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual void GrantDeleteFromFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; - virtual void GrantScheme(int child_id, const std::string& scheme) OVERRIDE; - virtual bool CanReadFile(int child_id, const base::FilePath& file) OVERRIDE; + const std::string& filesystem_id) override; + virtual void GrantScheme(int child_id, const std::string& scheme) override; + virtual bool CanReadFile(int child_id, const base::FilePath& file) override; virtual bool CanCreateReadWriteFile(int child_id, - const base::FilePath& file) OVERRIDE; + const base::FilePath& file) override; virtual bool CanReadFileSystem(int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual bool CanReadWriteFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual bool CanCopyIntoFileSystem(int child_id, - const std::string& filesystem_id) OVERRIDE; + const std::string& filesystem_id) override; virtual bool CanDeleteFromFileSystem( int child_id, - const std::string& filesystem_id) OVERRIDE; - virtual bool HasWebUIBindings(int child_id) OVERRIDE; + const std::string& filesystem_id) override; + virtual bool HasWebUIBindings(int child_id) override; // Pseudo schemes are treated differently than other schemes because they // cannot be requested like normal URLs. There is no mechanism for revoking diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index b0c658e..daf0b8d 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -34,7 +34,7 @@ class ChildProcessSecurityPolicyTestBrowserClient public: ChildProcessSecurityPolicyTestBrowserClient() {} - virtual bool IsHandledURL(const GURL& url) OVERRIDE { + virtual bool IsHandledURL(const GURL& url) override { return schemes_.find(url.scheme()) != schemes_.end(); } diff --git a/content/browser/cocoa/system_hotkey_map_unittest.mm b/content/browser/cocoa/system_hotkey_map_unittest.mm index 5f088fb..6b2652f 100644 --- a/content/browser/cocoa/system_hotkey_map_unittest.mm +++ b/content/browser/cocoa/system_hotkey_map_unittest.mm @@ -56,7 +56,7 @@ class SystemHotkeyMapTest : public ::testing::Test { ++count_; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { system_hotkey_dictionary_.reset([[NSMutableDictionary alloc] init]); system_hotkey_inner_dictionary_.reset([[NSMutableDictionary alloc] init]); [system_hotkey_dictionary_ setObject:system_hotkey_inner_dictionary_ @@ -64,7 +64,7 @@ class SystemHotkeyMapTest : public ::testing::Test { count_ = 100; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { system_hotkey_dictionary_.reset(); system_hotkey_inner_dictionary_.reset(); } diff --git a/content/browser/cross_site_transfer_browsertest.cc b/content/browser/cross_site_transfer_browsertest.cc index 8082eb2..55e132d 100644 --- a/content/browser/cross_site_transfer_browsertest.cc +++ b/content/browser/cross_site_transfer_browsertest.cc @@ -38,7 +38,7 @@ class TrackingResourceDispatcherHostDelegate ResourceContext* resource_context, AppCacheService* appcache_service, ResourceType resource_type, - ScopedVector<ResourceThrottle>* throttles) OVERRIDE { + ScopedVector<ResourceThrottle>* throttles) override { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ShellResourceDispatcherHostDelegate::RequestBeginning( request, resource_context, appcache_service, resource_type, throttles); @@ -97,7 +97,7 @@ class TrackingResourceDispatcherHostDelegate } // ResourceThrottle implementation: - virtual const char* GetNameForLogging() const OVERRIDE { + virtual const char* GetNameForLogging() const override { return "TrackingThrottle"; } @@ -145,7 +145,7 @@ class NoTransferRequestDelegate : public WebContentsDelegate { NoTransferRequestDelegate() {} virtual WebContents* OpenURLFromTab(WebContents* source, - const OpenURLParams& params) OVERRIDE { + const OpenURLParams& params) override { bool is_transfer = (params.transferred_global_request_id != GlobalRequestID()); if (is_transfer) @@ -172,7 +172,7 @@ class CrossSiteTransferTest : public ContentBrowserTest { } // ContentBrowserTest implementation: - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind( @@ -180,7 +180,7 @@ class CrossSiteTransferTest : public ContentBrowserTest { base::Unretained(this))); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind( @@ -205,7 +205,7 @@ class CrossSiteTransferTest : public ContentBrowserTest { load_observer.Wait(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Use --site-per-process to force process swaps for cross-site transfers. command_line->AppendSwitch(switches::kSitePerProcess); } diff --git a/content/browser/database_quota_client_unittest.cc b/content/browser/database_quota_client_unittest.cc index c458a9a..ca31e50 100644 --- a/content/browser/database_quota_client_unittest.cc +++ b/content/browser/database_quota_client_unittest.cc @@ -38,7 +38,7 @@ class MockDatabaseTracker : public DatabaseTracker { virtual bool GetOriginInfo( const std::string& origin_identifier, - OriginInfo* info) OVERRIDE { + OriginInfo* info) override { std::map<GURL, MockOriginInfo>::const_iterator found = mock_origin_infos_.find( storage::GetOriginFromIdentifier(origin_identifier)); @@ -49,7 +49,7 @@ class MockDatabaseTracker : public DatabaseTracker { } virtual bool GetAllOriginIdentifiers( - std::vector<std::string>* origins_identifiers) OVERRIDE { + std::vector<std::string>* origins_identifiers) override { std::map<GURL, MockOriginInfo>::const_iterator iter; for (iter = mock_origin_infos_.begin(); iter != mock_origin_infos_.end(); @@ -60,7 +60,7 @@ class MockDatabaseTracker : public DatabaseTracker { } virtual bool GetAllOriginsInfo( - std::vector<OriginInfo>* origins_info) OVERRIDE { + std::vector<OriginInfo>* origins_info) override { std::map<GURL, MockOriginInfo>::const_iterator iter; for (iter = mock_origin_infos_.begin(); iter != mock_origin_infos_.end(); @@ -72,7 +72,7 @@ class MockDatabaseTracker : public DatabaseTracker { virtual int DeleteDataForOrigin( const std::string& origin_identifier, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { ++delete_called_count_; if (async_delete()) { base::MessageLoopProxy::current()->PostTask( diff --git a/content/browser/database_tracker_unittest.cc b/content/browser/database_tracker_unittest.cc index 86f93a9..f456811 100644 --- a/content/browser/database_tracker_unittest.cc +++ b/content/browser/database_tracker_unittest.cc @@ -46,7 +46,7 @@ class TestObserver : public storage::DatabaseTracker::Observer { virtual ~TestObserver() {} virtual void OnDatabaseSizeChanged(const std::string& origin_identifier, const base::string16& database_name, - int64 database_size) OVERRIDE { + int64 database_size) override { if (!observe_size_changes_) return; new_notification_received_ = true; @@ -56,7 +56,7 @@ class TestObserver : public storage::DatabaseTracker::Observer { } virtual void OnDatabaseScheduledForDeletion( const std::string& origin_identifier, - const base::string16& database_name) OVERRIDE { + const base::string16& database_name) override { if (!observe_scheduled_deletions_) return; new_notification_received_ = true; @@ -103,14 +103,14 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy { registered_client_(NULL) { } - virtual void RegisterClient(storage::QuotaClient* client) OVERRIDE { + virtual void RegisterClient(storage::QuotaClient* client) override { EXPECT_FALSE(registered_client_); registered_client_ = client; } virtual void NotifyStorageAccessed(storage::QuotaClient::ID client_id, const GURL& origin, - storage::StorageType type) OVERRIDE { + storage::StorageType type) override { EXPECT_EQ(storage::QuotaClient::kDatabase, client_id); EXPECT_EQ(storage::kStorageTypeTemporary, type); accesses_[origin] += 1; @@ -119,7 +119,7 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy { virtual void NotifyStorageModified(storage::QuotaClient::ID client_id, const GURL& origin, storage::StorageType type, - int64 delta) OVERRIDE { + int64 delta) override { EXPECT_EQ(storage::QuotaClient::kDatabase, client_id); EXPECT_EQ(storage::kStorageTypeTemporary, type); modifications_[origin].first += 1; @@ -127,17 +127,17 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy { } // Not needed for our tests. - virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {} - virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {} + virtual void NotifyOriginInUse(const GURL& origin) override {} + virtual void NotifyOriginNoLongerInUse(const GURL& origin) override {} virtual void SetUsageCacheEnabled(storage::QuotaClient::ID client_id, const GURL& origin, storage::StorageType type, - bool enabled) OVERRIDE {} + bool enabled) override {} virtual void GetUsageAndQuota( base::SequencedTaskRunner* original_task_runner, const GURL& origin, storage::StorageType type, - const GetUsageAndQuotaCallback& callback) OVERRIDE {} + const GetUsageAndQuotaCallback& callback) override {} void SimulateQuotaManagerDestroyed() { if (registered_client_) { diff --git a/content/browser/device_monitor_mac.mm b/content/browser/device_monitor_mac.mm index 57a556b..cbe0bed 100644 --- a/content/browser/device_monitor_mac.mm +++ b/content/browser/device_monitor_mac.mm @@ -138,7 +138,7 @@ class QTKitMonitorImpl : public DeviceMonitorMacImpl { explicit QTKitMonitorImpl(content::DeviceMonitorMac* monitor); virtual ~QTKitMonitorImpl(); - virtual void OnDeviceChanged() OVERRIDE; + virtual void OnDeviceChanged() override; private: void CountDevices(); void OnAttributeChanged(NSNotification* notification); @@ -379,7 +379,7 @@ class AVFoundationMonitorImpl : public DeviceMonitorMacImpl { const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner); virtual ~AVFoundationMonitorImpl(); - virtual void OnDeviceChanged() OVERRIDE; + virtual void OnDeviceChanged() override; private: // {Video,AudioInput}DeviceManager's "Device" thread task runner used for diff --git a/content/browser/device_monitor_udev.h b/content/browser/device_monitor_udev.h index b65cfc5..a5bd5d6 100644 --- a/content/browser/device_monitor_udev.h +++ b/content/browser/device_monitor_udev.h @@ -29,7 +29,7 @@ class DeviceMonitorLinux : public base::MessageLoop::DestructionObserver { // This object is deleted on the UI thread after the IO thread has been // destroyed. Need to know when IO thread is being destroyed so that // we can delete udev_. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; void Initialize(); void OnDevicesChanged(udev_device* device); diff --git a/content/browser/file_descriptor_info_impl.h b/content/browser/file_descriptor_info_impl.h index f35ae74..cf6a4f2 100644 --- a/content/browser/file_descriptor_info_impl.h +++ b/content/browser/file_descriptor_info_impl.h @@ -17,14 +17,14 @@ class FileDescriptorInfoImpl : public FileDescriptorInfo { CONTENT_EXPORT static scoped_ptr<FileDescriptorInfo> Create(); virtual ~FileDescriptorInfoImpl(); - virtual void Share(int id, base::PlatformFile fd) OVERRIDE; - virtual void Transfer(int id, base::ScopedFD fd) OVERRIDE; - virtual const base::FileHandleMappingVector& GetMapping() const OVERRIDE; + virtual void Share(int id, base::PlatformFile fd) override; + virtual void Transfer(int id, base::ScopedFD fd) override; + virtual const base::FileHandleMappingVector& GetMapping() const override; virtual base::FileHandleMappingVector GetMappingWithIDAdjustment( - int delta) const OVERRIDE; - virtual base::PlatformFile GetFDAt(size_t i) const OVERRIDE; - virtual int GetIDAt(size_t i) const OVERRIDE; - virtual size_t GetMappingSize() const OVERRIDE; + int delta) const override; + virtual base::PlatformFile GetFDAt(size_t i) const override; + virtual int GetIDAt(size_t i) const override; + virtual size_t GetMappingSize() const override; private: FileDescriptorInfoImpl(); diff --git a/content/browser/histogram_internals_request_job.h b/content/browser/histogram_internals_request_job.h index 4be774b..6e52221 100644 --- a/content/browser/histogram_internals_request_job.h +++ b/content/browser/histogram_internals_request_job.h @@ -20,7 +20,7 @@ class HistogramInternalsRequestJob : public net::URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const net::CompletionCallback& callback) const OVERRIDE; + const net::CompletionCallback& callback) const override; private: virtual ~HistogramInternalsRequestJob() {} diff --git a/content/browser/histogram_message_filter.h b/content/browser/histogram_message_filter.h index 6786706..11ae8e0 100644 --- a/content/browser/histogram_message_filter.h +++ b/content/browser/histogram_message_filter.h @@ -19,7 +19,7 @@ class HistogramMessageFilter : public BrowserMessageFilter { HistogramMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~HistogramMessageFilter(); diff --git a/content/browser/histogram_synchronizer.h b/content/browser/histogram_synchronizer.h index 9ff69d5..4cfb766 100644 --- a/content/browser/histogram_synchronizer.h +++ b/content/browser/histogram_synchronizer.h @@ -97,14 +97,14 @@ class HistogramSynchronizer : public HistogramSubscriber { // This is called on UI thread. virtual void OnPendingProcesses(int sequence_number, int pending_processes, - bool end) OVERRIDE; + bool end) override; // Send histogram_data back to caller and also record that we are waiting // for one less histogram data from child process for the given sequence // number. This method is accessible on UI thread. virtual void OnHistogramDataCollected( int sequence_number, - const std::vector<std::string>& pickled_histograms) OVERRIDE; + const std::vector<std::string>& pickled_histograms) override; // Set the callback_thread_ and callback_ members. If these members already // had values, then as a side effect, post the old callback_ to the old diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h index 821fa0e..464d424 100644 --- a/content/browser/host_zoom_map_impl.h +++ b/content/browser/host_zoom_map_impl.h @@ -31,33 +31,33 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap), virtual ~HostZoomMapImpl(); // HostZoomMap implementation: - virtual void CopyFrom(HostZoomMap* copy) OVERRIDE; + virtual void CopyFrom(HostZoomMap* copy) override; virtual double GetZoomLevelForHostAndScheme( const std::string& scheme, - const std::string& host) const OVERRIDE; + const std::string& host) const override; // TODO(wjmaclean) Should we use a GURL here? crbug.com/384486 virtual bool HasZoomLevel(const std::string& scheme, - const std::string& host) const OVERRIDE; - virtual ZoomLevelVector GetAllZoomLevels() const OVERRIDE; + const std::string& host) const override; + virtual ZoomLevelVector GetAllZoomLevels() const override; virtual void SetZoomLevelForHost( const std::string& host, - double level) OVERRIDE; + double level) override; virtual void SetZoomLevelForHostAndScheme( const std::string& scheme, const std::string& host, - double level) OVERRIDE; + double level) override; virtual bool UsesTemporaryZoomLevel(int render_process_id, - int render_view_id) const OVERRIDE; + int render_view_id) const override; virtual void SetTemporaryZoomLevel(int render_process_id, int render_view_id, - double level) OVERRIDE; + double level) override; virtual void ClearTemporaryZoomLevel(int render_process_id, - int render_view_id) OVERRIDE; - virtual double GetDefaultZoomLevel() const OVERRIDE; - virtual void SetDefaultZoomLevel(double level) OVERRIDE; + int render_view_id) override; + virtual double GetDefaultZoomLevel() const override; + virtual void SetDefaultZoomLevel(double level) override; virtual scoped_ptr<Subscription> AddZoomLevelChangedCallback( - const ZoomLevelChangedCallback& callback) OVERRIDE; + const ZoomLevelChangedCallback& callback) override; // Returns the current zoom level for the specified WebContents. This may // be a temporary zoom level, depending on UsesTemporaryZoomLevel(). @@ -88,7 +88,7 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap), // NotificationObserver implementation. virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const NotificationDetails& details) override; private: typedef std::map<std::string, double> HostZoomLevels; diff --git a/content/browser/mach_broker_mac.h b/content/browser/mach_broker_mac.h index 51038bf..2f2ab13 100644 --- a/content/browser/mach_broker_mac.h +++ b/content/browser/mach_broker_mac.h @@ -64,18 +64,18 @@ class CONTENT_EXPORT MachBroker : public base::ProcessMetrics::PortProvider, void AddPlaceholderForPid(base::ProcessHandle pid); // Implement |ProcessMetrics::PortProvider|. - virtual mach_port_t TaskForPid(base::ProcessHandle process) const OVERRIDE; + virtual mach_port_t TaskForPid(base::ProcessHandle process) const override; // Implement |BrowserChildProcessObserver|. virtual void BrowserChildProcessHostDisconnected( - const ChildProcessData& data) OVERRIDE; + const ChildProcessData& data) override; virtual void BrowserChildProcessCrashed( - const ChildProcessData& data) OVERRIDE; + const ChildProcessData& data) override; // Implement |NotificationObserver|. virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const NotificationDetails& details) override; private: friend class MachBrokerTest; friend class MachListenerThreadDelegate; diff --git a/content/browser/mach_broker_mac.mm b/content/browser/mach_broker_mac.mm index d526d6e..4be771a 100644 --- a/content/browser/mach_broker_mac.mm +++ b/content/browser/mach_broker_mac.mm @@ -85,7 +85,7 @@ class MachListenerThreadDelegate : public base::PlatformThread::Delegate { } // Implement |PlatformThread::Delegate|. - virtual void ThreadMain() OVERRIDE { + virtual void ThreadMain() override { MachBroker_ParentRecvMsg msg; bzero(&msg, sizeof(msg)); msg.header.msgh_size = sizeof(msg); diff --git a/content/browser/manifest/manifest_manager_host.h b/content/browser/manifest/manifest_manager_host.h index ee24153..0decc91 100644 --- a/content/browser/manifest/manifest_manager_host.h +++ b/content/browser/manifest/manifest_manager_host.h @@ -43,8 +43,8 @@ class ManifestManagerHost : public WebContentsObserver { // WebContentsObserver virtual bool OnMessageReceived(const IPC::Message&, - RenderFrameHost*) OVERRIDE; - virtual void RenderFrameDeleted(RenderFrameHost*) OVERRIDE; + RenderFrameHost*) override; + virtual void RenderFrameDeleted(RenderFrameHost*) override; private: typedef IDMap<GetManifestCallback, IDMapOwnPointer> CallbackMap; diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 41fedb8..8f3b342 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -151,7 +151,7 @@ class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest { MAYBE_WebRtcInternalsBrowserTest() {} virtual ~MAYBE_WebRtcInternalsBrowserTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Assume this is set by the content test launcher. ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseFakeUIForMediaStream)); diff --git a/content/browser/message_port_message_filter.h b/content/browser/message_port_message_filter.h index 64d07d6..caa030e 100644 --- a/content/browser/message_port_message_filter.h +++ b/content/browser/message_port_message_filter.h @@ -22,9 +22,9 @@ class CONTENT_EXPORT MessagePortMessageFilter : public BrowserMessageFilter { explicit MessagePortMessageFilter(const NextRoutingIDCallback& callback); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnDestruct() const OVERRIDE; + virtual void OnChannelClosing() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnDestruct() const override; int GetNextRoutingID(); diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h index 4237f50..8d97759 100644 --- a/content/browser/mime_registry_message_filter.h +++ b/content/browser/mime_registry_message_filter.h @@ -16,8 +16,8 @@ class MimeRegistryMessageFilter : public BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, - BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + BrowserThread::ID* thread) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~MimeRegistryMessageFilter(); diff --git a/content/browser/net_info_browsertest.cc b/content/browser/net_info_browsertest.cc index 605ae81..23a2968 100644 --- a/content/browser/net_info_browsertest.cc +++ b/content/browser/net_info_browsertest.cc @@ -14,14 +14,14 @@ class NetInfoBrowserTest : public content::ContentBrowserTest { protected: - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { // TODO(jkarlin): Once NetInfo is enabled on all platforms remove this // switch. command_line->AppendSwitch(switches::kEnableNetworkInformation); } #if defined(OS_CHROMEOS) - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // ChromeOS's NetworkChangeNotifier isn't known to content and therefore // doesn't get created in content_browsertests. Insert a mock // NetworkChangeNotifier. @@ -30,7 +30,7 @@ class NetInfoBrowserTest : public content::ContentBrowserTest { } #endif - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { net::NetworkChangeNotifier::SetTestNotificationsOnly(true); base::RunLoop().RunUntilIdle(); } diff --git a/content/browser/notification_service_impl.h b/content/browser/notification_service_impl.h index c9dce92..7d0ecaa 100644 --- a/content/browser/notification_service_impl.h +++ b/content/browser/notification_service_impl.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT NotificationServiceImpl : public NotificationService { // NotificationService: virtual void Notify(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const NotificationDetails& details) override; private: friend class NotificationRegistrar; diff --git a/content/browser/notification_service_impl_unittest.cc b/content/browser/notification_service_impl_unittest.cc index 1317e4a..7bfedc5 100644 --- a/content/browser/notification_service_impl_unittest.cc +++ b/content/browser/notification_service_impl_unittest.cc @@ -24,7 +24,7 @@ class TestObserver : public NotificationObserver { virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE { + const NotificationDetails& details) override { ++notification_count_; } diff --git a/content/browser/pepper_flash_settings_helper_impl.h b/content/browser/pepper_flash_settings_helper_impl.h index 19584a8..a579ab1 100644 --- a/content/browser/pepper_flash_settings_helper_impl.h +++ b/content/browser/pepper_flash_settings_helper_impl.h @@ -21,15 +21,15 @@ class CONTENT_EXPORT PepperFlashSettingsHelperImpl // PepperFlashSettingsHelper implementation. virtual void OpenChannelToBroker( const base::FilePath& path, - const OpenChannelCallback& callback) OVERRIDE; + const OpenChannelCallback& callback) override; // PpapiPluginProcessHost::BrokerClient implementation. virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, - int* renderer_id) OVERRIDE; + int* renderer_id) override; virtual void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle, base::ProcessId plugin_pid, - int plugin_child_id) OVERRIDE; - virtual bool OffTheRecord() OVERRIDE; + int plugin_child_id) override; + virtual bool OffTheRecord() override; protected: virtual ~PepperFlashSettingsHelperImpl(); diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index 4c4d4a7..8caf7ea 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -49,7 +49,7 @@ class PluginTest : public ContentBrowserTest { protected: PluginTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Some NPAPI tests schedule garbage collection to force object tear-down. command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); @@ -76,7 +76,7 @@ class PluginTest : public ContentBrowserTest { #endif } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { base::FilePath path = GetTestFilePath("", ""); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path)); @@ -512,7 +512,7 @@ class TestResourceDispatcherHostDelegate net::URLRequest* request, ResourceContext* resource_context, ResourceResponse* response, - IPC::Sender* sender) OVERRIDE { + IPC::Sender* sender) override { // The URL below comes from plugin_geturl_test.cc. if (!EndsWith(request->url().spec(), "npapi/plugin_ref_target_page.html", diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index a318e72..1f6f615 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -122,32 +122,32 @@ class PluginDataRemoverImpl::Context } // PluginProcessHost::Client methods. - virtual int ID() OVERRIDE { + virtual int ID() override { // Generate a unique identifier for this PluginProcessHostClient. return ChildProcessHostImpl::GenerateChildProcessUniqueId(); } - virtual bool OffTheRecord() OVERRIDE { + virtual bool OffTheRecord() override { return false; } - virtual ResourceContext* GetResourceContext() OVERRIDE { + virtual ResourceContext* GetResourceContext() override { return resource_context_; } - virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE {} + virtual void SetPluginInfo(const WebPluginInfo& info) override {} - virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {} + virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override {} - virtual void OnSentPluginChannelRequest() OVERRIDE {} + virtual void OnSentPluginChannelRequest() override {} - virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE { + virtual void OnChannelOpened(const IPC::ChannelHandle& handle) override { ConnectToChannel(handle, false); // Balancing the AddRef call. Release(); } - virtual void OnError() OVERRIDE { + virtual void OnError() override { LOG(ERROR) << "Couldn't open plugin channel"; SignalDone(); // Balancing the AddRef call. @@ -156,7 +156,7 @@ class PluginDataRemoverImpl::Context // PpapiPluginProcessHost::BrokerClient implementation. virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle, - int* renderer_id) OVERRIDE { + int* renderer_id) override { *renderer_handle = base::kNullProcessHandle; *renderer_id = 0; } @@ -164,7 +164,7 @@ class PluginDataRemoverImpl::Context virtual void OnPpapiChannelOpened( const IPC::ChannelHandle& channel_handle, base::ProcessId /* peer_pid */, - int /* child_id */) OVERRIDE { + int /* child_id */) override { if (!channel_handle.name.empty()) ConnectToChannel(channel_handle, true); @@ -173,7 +173,7 @@ class PluginDataRemoverImpl::Context } // IPC::Listener methods. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { IPC_BEGIN_MESSAGE_MAP(Context, message) IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ClearSiteDataResult, OnClearSiteDataResult) @@ -185,7 +185,7 @@ class PluginDataRemoverImpl::Context return true; } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { if (is_removing_) { NOTREACHED() << "Channel error"; SignalDone(); diff --git a/content/browser/plugin_data_remover_impl.h b/content/browser/plugin_data_remover_impl.h index 6f4be32..54964ea 100644 --- a/content/browser/plugin_data_remover_impl.h +++ b/content/browser/plugin_data_remover_impl.h @@ -20,7 +20,7 @@ class CONTENT_EXPORT PluginDataRemoverImpl : public PluginDataRemover { virtual ~PluginDataRemoverImpl(); // PluginDataRemover implementation: - virtual base::WaitableEvent* StartRemoving(base::Time begin_time) OVERRIDE; + virtual base::WaitableEvent* StartRemoving(base::Time begin_time) override; // The plug-in whose data should be removed (usually Flash) is specified via // its MIME type. This method sets a different MIME type in order to call a diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc index 3dfe492..9ea58b1 100644 --- a/content/browser/plugin_data_remover_impl_browsertest.cc +++ b/content/browser/plugin_data_remover_impl_browsertest.cc @@ -28,7 +28,7 @@ class PluginDataRemoverTest : public ContentBrowserTest { base::MessageLoop::current()->Quit(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_MACOSX) base::FilePath browser_directory; PathService::Get(base::DIR_MODULE, &browser_directory); diff --git a/content/browser/plugin_loader_posix.h b/content/browser/plugin_loader_posix.h index 42c6437..4745004 100644 --- a/content/browser/plugin_loader_posix.h +++ b/content/browser/plugin_loader_posix.h @@ -55,11 +55,11 @@ class CONTENT_EXPORT PluginLoaderPosix void GetPlugins(const PluginService::GetPluginsCallback& callback); // UtilityProcessHostClient: - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC::Sender: - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; private: virtual ~PluginLoaderPosix(); diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index 542b2c6..0d4115e 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -77,7 +77,7 @@ class PluginLoaderPosixTest : public testing::Test { plugin_loader_(new MockPluginLoaderPosix) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PluginServiceImpl::GetInstance()->Init(); } diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index f5f3f2c..9f4a06b 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -107,12 +107,12 @@ class PluginSandboxedProcessLauncherDelegate virtual ~PluginSandboxedProcessLauncherDelegate() {} #if defined(OS_WIN) - virtual bool ShouldSandbox() OVERRIDE { + virtual bool ShouldSandbox() override { return false; } #elif defined(OS_POSIX) - virtual int GetIpcFd() OVERRIDE { + virtual int GetIpcFd() override { return ipc_fd_; } #endif // OS_WIN diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h index e4f9113..2b4f9df 100644 --- a/content/browser/plugin_process_host.h +++ b/content/browser/plugin_process_host.h @@ -78,7 +78,7 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHostDelegate, virtual ~PluginProcessHost(); // IPC::Sender implementation: - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; // Initialize the new plugin process, returning true on success. This must // be called before the object can be used. @@ -87,9 +87,9 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHostDelegate, // Force the plugin process to shutdown (cleanly). void ForceShutdown(); - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; // Tells the plugin process to create a new channel for communication with a // renderer. When the plugin process responds with the channel name, @@ -147,8 +147,8 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHostDelegate, void OnPluginSetCursorVisibility(bool visible); #endif - virtual bool CanShutdown() OVERRIDE; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; + virtual bool CanShutdown() override; + virtual void OnProcessCrashed(int exit_code) override; void CancelRequests(); diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 8cb176a..a0353e5 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -69,14 +69,14 @@ class CONTENT_EXPORT PluginServiceImpl static PluginServiceImpl* GetInstance(); // PluginService implementation: - virtual void Init() OVERRIDE; - virtual void StartWatchingPlugins() OVERRIDE; + virtual void Init() override; + virtual void StartWatchingPlugins() override; virtual bool GetPluginInfoArray( const GURL& url, const std::string& mime_type, bool allow_wildcard, std::vector<WebPluginInfo>* info, - std::vector<std::string>* actual_mime_types) OVERRIDE; + std::vector<std::string>* actual_mime_types) override; virtual bool GetPluginInfo(int render_process_id, int render_frame_id, ResourceContext* context, @@ -86,41 +86,41 @@ class CONTENT_EXPORT PluginServiceImpl bool allow_wildcard, bool* is_stale, WebPluginInfo* info, - std::string* actual_mime_type) OVERRIDE; + std::string* actual_mime_type) override; virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path, - WebPluginInfo* info) OVERRIDE; + WebPluginInfo* info) override; virtual base::string16 GetPluginDisplayNameByPath( - const base::FilePath& path) OVERRIDE; - virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE; + const base::FilePath& path) override; + virtual void GetPlugins(const GetPluginsCallback& callback) override; virtual PepperPluginInfo* GetRegisteredPpapiPluginInfo( - const base::FilePath& plugin_path) OVERRIDE; - virtual void SetFilter(PluginServiceFilter* filter) OVERRIDE; - virtual PluginServiceFilter* GetFilter() OVERRIDE; - virtual void ForcePluginShutdown(const base::FilePath& plugin_path) OVERRIDE; - virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE; - virtual void RefreshPlugins() OVERRIDE; - virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE; - virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE; - virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; + const base::FilePath& plugin_path) override; + virtual void SetFilter(PluginServiceFilter* filter) override; + virtual PluginServiceFilter* GetFilter() override; + virtual void ForcePluginShutdown(const base::FilePath& plugin_path) override; + virtual bool IsPluginUnstable(const base::FilePath& plugin_path) override; + virtual void RefreshPlugins() override; + virtual void AddExtraPluginPath(const base::FilePath& path) override; + virtual void RemoveExtraPluginPath(const base::FilePath& path) override; + virtual void AddExtraPluginDir(const base::FilePath& path) override; virtual void RegisterInternalPlugin( - const WebPluginInfo& info, bool add_at_beginning) OVERRIDE; - virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; + const WebPluginInfo& info, bool add_at_beginning) override; + virtual void UnregisterInternalPlugin(const base::FilePath& path) override; virtual void GetInternalPlugins( - std::vector<WebPluginInfo>* plugins) OVERRIDE; - virtual bool NPAPIPluginsSupported() OVERRIDE; - virtual void DisablePluginsDiscoveryForTesting() OVERRIDE; + std::vector<WebPluginInfo>* plugins) override; + virtual bool NPAPIPluginsSupported() override; + virtual void DisablePluginsDiscoveryForTesting() override; #if defined(OS_MACOSX) - virtual void AppActivated() OVERRIDE; + virtual void AppActivated() override; #elif defined(OS_WIN) virtual bool GetPluginInfoFromWindow(HWND window, base::string16* plugin_name, - base::string16* plugin_version) OVERRIDE; + base::string16* plugin_version) override; // Returns true iff the given HWND is a plugin. bool IsPluginWindow(HWND window); #endif virtual bool PpapiDevChannelSupported(BrowserContext* browser_context, - const GURL& document_url) OVERRIDE; + const GURL& document_url) override; // Returns the plugin process host corresponding to the plugin process that // has been started by this service. This will start a process to host the diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 7a3271e..0a63d87 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -48,15 +48,15 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client, } // PluginProcessHost::Client implementation. - virtual int ID() OVERRIDE { return 42; } - virtual bool OffTheRecord() OVERRIDE { return false; } - virtual ResourceContext* GetResourceContext() OVERRIDE { + virtual int ID() override { return 42; } + virtual bool OffTheRecord() override { return false; } + virtual ResourceContext* GetResourceContext() override { return context_; } - virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {} - virtual void OnSentPluginChannelRequest() OVERRIDE {} + virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override {} + virtual void OnSentPluginChannelRequest() override {} - virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE { + virtual void OnChannelOpened(const IPC::ChannelHandle& handle) override { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); ASSERT_TRUE(set_plugin_info_called_); ASSERT_TRUE(!channel_); @@ -64,34 +64,34 @@ class MockPluginProcessHostClient : public PluginProcessHost::Client, ASSERT_TRUE(channel_->Connect()); } - virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE { + virtual void SetPluginInfo(const WebPluginInfo& info) override { ASSERT_TRUE(info.mime_types.size()); ASSERT_EQ(kNPAPITestPluginMimeType, info.mime_types[0].mime_type); set_plugin_info_called_ = true; } - virtual void OnError() OVERRIDE { + virtual void OnError() override { Fail(); } // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { Fail(); return false; } - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE { + virtual void OnChannelConnected(int32 peer_pid) override { if (expect_fail_) FAIL(); QuitMessageLoop(); } - virtual void OnChannelError() OVERRIDE { + virtual void OnChannelError() override { Fail(); } #if defined(OS_POSIX) - virtual void OnChannelDenied() OVERRIDE { + virtual void OnChannelDenied() override { Fail(); } - virtual void OnChannelListenError() OVERRIDE { + virtual void OnChannelListenError() override { Fail(); } #endif @@ -125,11 +125,11 @@ class MockPluginServiceFilter : public content::PluginServiceFilter { const void* context, const GURL& url, const GURL& policy_url, - WebPluginInfo* plugin) OVERRIDE { return true; } + WebPluginInfo* plugin) override { return true; } virtual bool CanLoadPlugin( int render_process_id, - const base::FilePath& path) OVERRIDE { return false; } + const base::FilePath& path) override { return false; } }; class PluginServiceTest : public ContentBrowserTest { @@ -140,7 +140,7 @@ class PluginServiceTest : public ContentBrowserTest { return shell()->web_contents()->GetBrowserContext()->GetResourceContext(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { #if defined(OS_MACOSX) base::FilePath browser_directory; PathService::Get(base::DIR_MODULE, &browser_directory); @@ -193,7 +193,7 @@ class MockCanceledPluginServiceClient : public PluginProcessHost::Client { // Client implementation. MOCK_METHOD0(ID, int()); - virtual ResourceContext* GetResourceContext() OVERRIDE { + virtual ResourceContext* GetResourceContext() override { get_resource_context_called_ = true; return context_; } @@ -257,13 +257,13 @@ class MockCanceledBeforeSentPluginProcessHostClient virtual ~MockCanceledBeforeSentPluginProcessHostClient() {} // Client implementation. - virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE { + virtual void SetPluginInfo(const WebPluginInfo& info) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ASSERT_TRUE(info.mime_types.size()); ASSERT_EQ(kNPAPITestPluginMimeType, info.mime_types[0].mime_type); set_plugin_info_called_ = true; } - virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE { + virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); set_on_found_plugin_process_host_called(); set_host(host); @@ -330,17 +330,17 @@ class MockCanceledAfterSentPluginProcessHostClient // Client implementation. - virtual int ID() OVERRIDE { return 42; } - virtual bool OffTheRecord() OVERRIDE { return false; } + virtual int ID() override { return 42; } + virtual bool OffTheRecord() override { return false; } // We override this guy again since we don't want to cancel yet. - virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE { + virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); set_on_found_plugin_process_host_called(); set_host(host); } - virtual void OnSentPluginChannelRequest() OVERRIDE { + virtual void OnSentPluginChannelRequest() override { on_sent_plugin_channel_request_called_ = true; host()->CancelSentRequest(this); BrowserThread::PostTask( diff --git a/content/browser/power_monitor_message_broadcaster.h b/content/browser/power_monitor_message_broadcaster.h index 21b266a..926193d 100644 --- a/content/browser/power_monitor_message_broadcaster.h +++ b/content/browser/power_monitor_message_broadcaster.h @@ -24,9 +24,9 @@ class CONTENT_EXPORT PowerMonitorMessageBroadcaster virtual ~PowerMonitorMessageBroadcaster(); // Implement PowerObserver. - virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE; - virtual void OnSuspend() OVERRIDE; - virtual void OnResume() OVERRIDE; + virtual void OnPowerStateChange(bool on_battery_power) override; + virtual void OnSuspend() override; + virtual void OnResume() override; void Init(); diff --git a/content/browser/power_monitor_message_broadcaster_unittest.cc b/content/browser/power_monitor_message_broadcaster_unittest.cc index c277e83..4a28d95 100644 --- a/content/browser/power_monitor_message_broadcaster_unittest.cc +++ b/content/browser/power_monitor_message_broadcaster_unittest.cc @@ -19,7 +19,7 @@ class PowerMonitorMessageSender : public IPC::Sender { } virtual ~PowerMonitorMessageSender() {} - virtual bool Send(IPC::Message* msg) OVERRIDE { + virtual bool Send(IPC::Message* msg) override { switch (msg->type()) { case PowerMonitorMsg_Suspend::ID: suspends_++; diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 49d3017..8346abf 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -51,7 +51,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate virtual ~PpapiPluginSandboxedProcessLauncherDelegate() {} #if defined(OS_WIN) - virtual bool ShouldSandbox() OVERRIDE { + virtual bool ShouldSandbox() override { return !is_broker_; } @@ -69,14 +69,14 @@ class PpapiPluginSandboxedProcessLauncherDelegate } #elif defined(OS_POSIX) - virtual bool ShouldUseZygote() OVERRIDE { + virtual bool ShouldUseZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType plugin_launcher = browser_command_line .GetSwitchValueNative(switches::kPpapiPluginLauncher); return !is_broker_ && plugin_launcher.empty() && info_.is_sandboxed; } - virtual int GetIpcFd() OVERRIDE { + virtual int GetIpcFd() override { return ipc_fd_; } #endif // OS_WIN @@ -107,7 +107,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver } // IPAddressObserver implementation. - virtual void OnIPAddressChanged() OVERRIDE { + virtual void OnIPAddressChanged() override { // TODO(brettw) bug 90246: This doesn't seem correct. The online/offline // notification seems like it should be sufficient, but I don't see that // when I unplug and replug my network cable. Sending this notification when @@ -119,7 +119,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver // ConnectionTypeObserver implementation. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { + net::NetworkChangeNotifier::ConnectionType type) override { process_host_->Send(new PpapiMsg_SetNetworkState( type != net::NetworkChangeNotifier::CONNECTION_NONE)); } diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h index 594c12f..ff58c30 100644 --- a/content/browser/ppapi_plugin_process_host.h +++ b/content/browser/ppapi_plugin_process_host.h @@ -96,7 +96,7 @@ class PpapiPluginProcessHost : public BrowserChildProcessHostDelegate, std::vector<PpapiPluginProcessHost*>* hosts); // IPC::Sender implementation: - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; // Opens a new channel to the plugin. The client will be notified when the // channel is ready or if there's an error. @@ -126,12 +126,12 @@ class PpapiPluginProcessHost : public BrowserChildProcessHostDelegate, void RequestPluginChannel(Client* client); - virtual void OnProcessLaunched() OVERRIDE; + virtual void OnProcessLaunched() override; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual void OnProcessCrashed(int exit_code) override; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void OnChannelConnected(int32 peer_pid) override; + virtual void OnChannelError() override; void CancelRequests(); diff --git a/content/browser/profiler_controller_impl.h b/content/browser/profiler_controller_impl.h index 34c76ec..b90e1f8 100644 --- a/content/browser/profiler_controller_impl.h +++ b/content/browser/profiler_controller_impl.h @@ -42,9 +42,9 @@ class ProfilerControllerImpl : public ProfilerController { int process_type); // ProfilerController implementation: - virtual void Register(ProfilerSubscriber* subscriber) OVERRIDE; - virtual void Unregister(const ProfilerSubscriber* subscriber) OVERRIDE; - virtual void GetProfilerData(int sequence_number) OVERRIDE; + virtual void Register(ProfilerSubscriber* subscriber) override; + virtual void Unregister(const ProfilerSubscriber* subscriber) override; + virtual void GetProfilerData(int sequence_number) override; private: friend struct DefaultSingletonTraits<ProfilerControllerImpl>; diff --git a/content/browser/profiler_message_filter.h b/content/browser/profiler_message_filter.h index 1575abc..2d068cf 100644 --- a/content/browser/profiler_message_filter.h +++ b/content/browser/profiler_message_filter.h @@ -21,10 +21,10 @@ class ProfilerMessageFilter : public BrowserMessageFilter { explicit ProfilerMessageFilter(int process_type); // BrowserMessageFilter implementation. - virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual void OnChannelConnected(int32 peer_pid) override; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; protected: virtual ~ProfilerMessageFilter(); diff --git a/content/browser/push_messaging_message_filter.h b/content/browser/push_messaging_message_filter.h index 1c0d60e..9aa1f4f2 100644 --- a/content/browser/push_messaging_message_filter.h +++ b/content/browser/push_messaging_message_filter.h @@ -28,7 +28,7 @@ class PushMessagingMessageFilter : public BrowserMessageFilter { virtual ~PushMessagingMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnRegister(int render_frame_id, int callbacks_id, diff --git a/content/browser/quota_dispatcher_host.h b/content/browser/quota_dispatcher_host.h index 4aea9b7..79ea104 100644 --- a/content/browser/quota_dispatcher_host.h +++ b/content/browser/quota_dispatcher_host.h @@ -31,7 +31,7 @@ class QuotaDispatcherHost : public BrowserMessageFilter { QuotaPermissionContext* permission_context); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; protected: virtual ~QuotaDispatcherHost(); diff --git a/content/browser/resolve_proxy_msg_helper.h b/content/browser/resolve_proxy_msg_helper.h index 167d946..ac313ee 100644 --- a/content/browser/resolve_proxy_msg_helper.h +++ b/content/browser/resolve_proxy_msg_helper.h @@ -38,7 +38,7 @@ class CONTENT_EXPORT ResolveProxyMsgHelper : public BrowserMessageFilter { explicit ResolveProxyMsgHelper(net::ProxyService* proxy_service); // BrowserMessageFilter implementation - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index 023fe43..3ddac35 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -18,10 +18,10 @@ namespace content { // This ProxyConfigService always returns "http://pac" as the PAC url to use. class MockProxyConfigService : public net::ProxyConfigService { public: - virtual void AddObserver(Observer* observer) OVERRIDE {} - virtual void RemoveObserver(Observer* observer) OVERRIDE {} + virtual void AddObserver(Observer* observer) override {} + virtual void RemoveObserver(Observer* observer) override {} virtual ConfigAvailability GetLatestProxyConfig( - net::ProxyConfig* results) OVERRIDE { + net::ProxyConfig* results) override { *results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac")); return CONFIG_VALID; } @@ -34,7 +34,7 @@ class TestResolveProxyMsgHelper : public ResolveProxyMsgHelper { IPC::Listener* listener) : ResolveProxyMsgHelper(proxy_service), listener_(listener) {} - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { listener_->OnMessageReceived(*message); delete message; return true; @@ -87,7 +87,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { scoped_ptr<PendingResult> pending_result_; private: - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& msg) override { TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple reply_data; EXPECT_TRUE(ViewHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data)); DCHECK(!pending_result_.get()); diff --git a/content/browser/screen_orientation/screen_orientation_browsertest.cc b/content/browser/screen_orientation/screen_orientation_browsertest.cc index f76f48b..c79cad0 100644 --- a/content/browser/screen_orientation/screen_orientation_browsertest.cc +++ b/content/browser/screen_orientation/screen_orientation_browsertest.cc @@ -32,12 +32,12 @@ class ScreenOrientationBrowserTest : public ContentBrowserTest { ScreenOrientationBrowserTest() { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch( switches::kEnableExperimentalWebPlatformFeatures); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Painting has to happen otherwise the Resize messages will be added on top // of each other without properly ack-painting which will fail and crash. UseSoftwareCompositing(); diff --git a/content/browser/screen_orientation/screen_orientation_delegate_android.h b/content/browser/screen_orientation/screen_orientation_delegate_android.h index e439685..fa3ee6e 100644 --- a/content/browser/screen_orientation/screen_orientation_delegate_android.h +++ b/content/browser/screen_orientation/screen_orientation_delegate_android.h @@ -35,11 +35,11 @@ class ScreenOrientationDelegateAndroid : public ScreenOrientationDelegate { static void StopAccurateListening(); // ScreenOrientationDelegate: - virtual bool FullScreenRequired(WebContents* web_contents) OVERRIDE; + virtual bool FullScreenRequired(WebContents* web_contents) override; virtual void Lock( - blink::WebScreenOrientationLockType lock_orientation) OVERRIDE; - virtual bool ScreenOrientationProviderSupported() OVERRIDE; - virtual void Unlock() OVERRIDE; + blink::WebScreenOrientationLockType lock_orientation) override; + virtual bool ScreenOrientationProviderSupported() override; + virtual void Unlock() override; private: DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDelegateAndroid); diff --git a/content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h b/content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h index 3766631..c22d65b 100644 --- a/content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h +++ b/content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h @@ -27,16 +27,16 @@ class CONTENT_EXPORT ScreenOrientationDispatcherHostImpl virtual ~ScreenOrientationDispatcherHostImpl(); // ScreenOrientationDispatcherHost: - virtual void NotifyLockSuccess(int request_id) OVERRIDE; + virtual void NotifyLockSuccess(int request_id) override; virtual void NotifyLockError(int request_id, - blink::WebLockOrientationError error) OVERRIDE; - virtual void OnOrientationChange() OVERRIDE; + blink::WebLockOrientationError error) override; + virtual void OnOrientationChange() override; // WebContentsObserver: virtual bool OnMessageReceived(const IPC::Message&, - RenderFrameHost* render_frame_host) OVERRIDE; + RenderFrameHost* render_frame_host) override; virtual void DidNavigateMainFrame(const LoadCommittedDetails& details, - const FrameNavigateParams& params) OVERRIDE; + const FrameNavigateParams& params) override; private: void OnLockRequest(RenderFrameHost* render_frame_host, diff --git a/content/browser/screen_orientation/screen_orientation_message_filter_android.h b/content/browser/screen_orientation/screen_orientation_message_filter_android.h index 9e19673..9a01ed4 100644 --- a/content/browser/screen_orientation/screen_orientation_message_filter_android.h +++ b/content/browser/screen_orientation/screen_orientation_message_filter_android.h @@ -14,7 +14,7 @@ class ScreenOrientationMessageFilterAndroid : public BrowserMessageFilter { ScreenOrientationMessageFilterAndroid(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~ScreenOrientationMessageFilterAndroid(); diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index 39712855..21b3a56 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -84,7 +84,7 @@ RenderViewHostImpl* PrepareToDuplicateHosts(Shell* shell, class SecurityExploitBrowserTest : public ContentBrowserTest { public: SecurityExploitBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ASSERT_TRUE(test_server()->Start()); // Add a host resolver rule to map all outgoing requests to the test server. diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc index be2fb59..26dc801 100644 --- a/content/browser/service_worker/embedded_worker_instance_unittest.cc +++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc @@ -24,11 +24,11 @@ class EmbeddedWorkerInstanceTest : public testing::Test { EmbeddedWorkerInstanceTest() : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kRenderProcessId)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { helper_.reset(); } diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h index c36773d..06e7374 100644 --- a/content/browser/service_worker/embedded_worker_test_helper.h +++ b/content/browser/service_worker/embedded_worker_test_helper.h @@ -53,10 +53,10 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, void SimulateAddProcessToPattern(const GURL& pattern, int process_id); // IPC::Sender implementation. - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // IPC sink for EmbeddedWorker messages. IPC::TestSink* ipc_sink() { return &sink_; } diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 34b09b2..b0d4dd0 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc @@ -145,7 +145,7 @@ class WorkerActivatedObserver RunOnIOThread(base::Bind(&WorkerActivatedObserver::InitOnIOThread, this)); } // ServiceWorkerContextObserver overrides. - virtual void OnVersionStateChanged(int64 version_id) OVERRIDE { + virtual void OnVersionStateChanged(int64 version_id) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); const ServiceWorkerVersion* version = context_->context()->GetLiveVersion(version_id); @@ -197,7 +197,7 @@ class LongLivedResourceInterceptor : public net::URLRequestInterceptor { // net::URLRequestInterceptor implementation virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { const char kHeaders[] = "HTTP/1.1 200 OK\0" "Content-Type: text/javascript\0" @@ -262,12 +262,12 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest { protected: typedef ServiceWorkerBrowserTest self; - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(base::CommandLine* command_line) override { command_line->AppendSwitch( switches::kEnableExperimentalWebPlatformFeatures); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); StoragePartition* partition = BrowserContext::GetDefaultStoragePartition( shell()->web_contents()->GetBrowserContext()); @@ -283,7 +283,7 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest { RunOnIOThread(base::Bind(&self::SetUpOnIOThread, this)); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() override { RunOnIOThread(base::Bind(&self::TearDownOnIOThread, this)); wrapper_ = NULL; } @@ -313,7 +313,7 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest, pause_mode_(DONT_PAUSE) {} virtual ~EmbeddedWorkerBrowserTest() {} - virtual void TearDownOnIOThread() OVERRIDE { + virtual void TearDownOnIOThread() override { if (worker_) { worker_->RemoveListener(this); worker_.reset(); @@ -367,19 +367,19 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest, protected: // EmbeddedWorkerInstance::Observer overrides: - virtual void OnStarted() OVERRIDE { + virtual void OnStarted() override { ASSERT_TRUE(worker_ != NULL); ASSERT_FALSE(done_closure_.is_null()); last_worker_status_ = worker_->status(); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_); } - virtual void OnStopped() OVERRIDE { + virtual void OnStopped() override { ASSERT_TRUE(worker_ != NULL); ASSERT_FALSE(done_closure_.is_null()); last_worker_status_ = worker_->status(); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_); } - virtual void OnPausedAfterDownload() OVERRIDE { + virtual void OnPausedAfterDownload() override { if (pause_mode_ == PAUSE_THEN_RESUME) worker_->ResumeAfterDownload(); else if (pause_mode_ == PAUSE_THEN_STOP) @@ -390,13 +390,13 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest, virtual void OnReportException(const base::string16& error_message, int line_number, int column_number, - const GURL& source_url) OVERRIDE {} + const GURL& source_url) override {} virtual void OnReportConsoleMessage(int source_identifier, int message_level, const base::string16& message, int line_number, - const GURL& source_url) OVERRIDE {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + const GURL& source_url) override {} + virtual bool OnMessageReceived(const IPC::Message& message) override { return false; } @@ -420,7 +420,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest { virtual ~ServiceWorkerVersionBrowserTest() {} - virtual void TearDownOnIOThread() OVERRIDE { + virtual void TearDownOnIOThread() override { registration_ = NULL; version_ = NULL; } diff --git a/content/browser/service_worker/service_worker_cache.cc b/content/browser/service_worker/service_worker_cache.cc index df8cfd3..e093b59 100644 --- a/content/browser/service_worker/service_worker_cache.cc +++ b/content/browser/service_worker/service_worker_cache.cc @@ -115,29 +115,29 @@ class BlobReader : public net::URLRequest::Delegate { // net::URLRequest::Delegate overrides for reading blobs. virtual void OnReceivedRedirect(net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { NOTREACHED(); } virtual void OnAuthRequired(net::URLRequest* request, - net::AuthChallengeInfo* auth_info) OVERRIDE { + net::AuthChallengeInfo* auth_info) override { NOTREACHED(); } virtual void OnCertificateRequested( net::URLRequest* request, - net::SSLCertRequestInfo* cert_request_info) OVERRIDE { + net::SSLCertRequestInfo* cert_request_info) override { NOTREACHED(); } virtual void OnSSLCertificateError(net::URLRequest* request, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { NOTREACHED(); } virtual void OnBeforeNetworkStart(net::URLRequest* request, - bool* defer) OVERRIDE { + bool* defer) override { NOTREACHED(); } - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE { + virtual void OnResponseStarted(net::URLRequest* request) override { if (!request->status().is_success()) { callback_.Run(false); return; @@ -154,7 +154,7 @@ class BlobReader : public net::URLRequest::Delegate { } virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE { + int bytes_read) override { if (!request->status().is_success()) { callback_.Run(false); return; diff --git a/content/browser/service_worker/service_worker_cache_listener.h b/content/browser/service_worker/service_worker_cache_listener.h index 949051d..5e95021 100644 --- a/content/browser/service_worker/service_worker_cache_listener.h +++ b/content/browser/service_worker/service_worker_cache_listener.h @@ -28,7 +28,7 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener { virtual ~ServiceWorkerCacheListener(); // From EmbeddedWorkerInstance::Listener: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: // The message receiver functions for the CacheStorage API: diff --git a/content/browser/service_worker/service_worker_cache_storage.cc b/content/browser/service_worker/service_worker_cache_storage.cc index f4f7b2d..758a124 100644 --- a/content/browser/service_worker/service_worker_cache_storage.cc +++ b/content/browser/service_worker/service_worker_cache_storage.cc @@ -83,13 +83,13 @@ class ServiceWorkerCacheStorage::MemoryLoader : CacheLoader(cache_task_runner, request_context, blob_context) {} virtual scoped_refptr<ServiceWorkerCache> CreateServiceWorkerCache( - const std::string& cache_name) OVERRIDE { + const std::string& cache_name) override { return ServiceWorkerCache::CreateMemoryCache(request_context_, blob_context_); } virtual void CreateCache(const std::string& cache_name, - const CacheCallback& callback) OVERRIDE { + const CacheCallback& callback) override { scoped_refptr<ServiceWorkerCache> cache = ServiceWorkerCache::CreateMemoryCache(request_context_, blob_context_); cache_refs_.insert(std::make_pair(cache_name, cache)); @@ -97,7 +97,7 @@ class ServiceWorkerCacheStorage::MemoryLoader } virtual void CleanUpDeletedCache(const std::string& cache_name, - const BoolCallback& callback) OVERRIDE { + const BoolCallback& callback) override { CacheRefMap::iterator it = cache_refs_.find(cache_name); DCHECK(it != cache_refs_.end()); cache_refs_.erase(it); @@ -105,12 +105,12 @@ class ServiceWorkerCacheStorage::MemoryLoader } virtual void WriteIndex(const StringVector& cache_names, - const BoolCallback& callback) OVERRIDE { + const BoolCallback& callback) override { callback.Run(false); } virtual void LoadIndex(scoped_ptr<std::vector<std::string> > cache_names, - const StringVectorCallback& callback) OVERRIDE { + const StringVectorCallback& callback) override { callback.Run(cache_names.Pass()); } @@ -136,7 +136,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader weak_ptr_factory_(this) {} virtual scoped_refptr<ServiceWorkerCache> CreateServiceWorkerCache( - const std::string& cache_name) OVERRIDE { + const std::string& cache_name) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); return ServiceWorkerCache::CreatePersistentCache( @@ -146,7 +146,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader } virtual void CreateCache(const std::string& cache_name, - const CacheCallback& callback) OVERRIDE { + const CacheCallback& callback) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); // 1. Delete the cache's directory if it exists. @@ -185,7 +185,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader } virtual void CleanUpDeletedCache(const std::string& cache_name, - const BoolCallback& callback) OVERRIDE { + const BoolCallback& callback) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); // 1. Delete the cache's directory. (CleanUpDeleteCacheDirInPool) @@ -209,7 +209,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader } virtual void WriteIndex(const StringVector& cache_names, - const BoolCallback& callback) OVERRIDE { + const BoolCallback& callback) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); // 1. Create the index file as a string. (WriteIndex) @@ -258,7 +258,7 @@ class ServiceWorkerCacheStorage::SimpleCacheLoader } virtual void LoadIndex(scoped_ptr<std::vector<std::string> > names, - const StringVectorCallback& callback) OVERRIDE { + const StringVectorCallback& callback) override { DCHECK_CURRENTLY_ON(BrowserThread::IO); // 1. Read the file from disk. (LoadIndexReadFileInPool) diff --git a/content/browser/service_worker/service_worker_cache_storage_manager_unittest.cc b/content/browser/service_worker/service_worker_cache_storage_manager_unittest.cc index e33bb68..a9cf8fb 100644 --- a/content/browser/service_worker/service_worker_cache_storage_manager_unittest.cc +++ b/content/browser/service_worker/service_worker_cache_storage_manager_unittest.cc @@ -29,7 +29,7 @@ class ServiceWorkerCacheStorageManagerTest : public testing::Test { origin1_("http://example1.com"), origin2_("http://example2.com") {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeBlobStorageContext* blob_storage_context( ChromeBlobStorageContext::GetFor(&browser_context_)); // Wait for ChromeBlobStorageContext to finish initializing. @@ -50,7 +50,7 @@ class ServiceWorkerCacheStorageManagerTest : public testing::Test { url_request_context, blob_storage_context->context()->AsWeakPtr()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { base::RunLoop().RunUntilIdle(); } @@ -241,13 +241,13 @@ class ServiceWorkerCacheStorageManagerTest : public testing::Test { class ServiceWorkerCacheStorageManagerMemoryOnlyTest : public ServiceWorkerCacheStorageManagerTest { - virtual bool MemoryOnly() OVERRIDE { return true; } + virtual bool MemoryOnly() override { return true; } }; class ServiceWorkerCacheStorageManagerTestP : public ServiceWorkerCacheStorageManagerTest, public testing::WithParamInterface<bool> { - virtual bool MemoryOnly() OVERRIDE { return !GetParam(); } + virtual bool MemoryOnly() override { return !GetParam(); } }; TEST_F(ServiceWorkerCacheStorageManagerTest, TestsRunOnIOThread) { diff --git a/content/browser/service_worker/service_worker_cache_unittest.cc b/content/browser/service_worker/service_worker_cache_unittest.cc index dacc3bc..3cbcbfc 100644 --- a/content/browser/service_worker/service_worker_cache_unittest.cc +++ b/content/browser/service_worker/service_worker_cache_unittest.cc @@ -46,7 +46,7 @@ class ServiceWorkerCacheTest : public testing::Test { : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP), callback_error_(ServiceWorkerCache::ErrorTypeOK) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ChromeBlobStorageContext* blob_storage_context = ChromeBlobStorageContext::GetFor(&browser_context_); // Wait for chrome_blob_storage_context to finish initializing. @@ -77,7 +77,7 @@ class ServiceWorkerCacheTest : public testing::Test { } } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { base::RunLoop().RunUntilIdle(); } @@ -283,7 +283,7 @@ class ServiceWorkerCacheTest : public testing::Test { class ServiceWorkerCacheTestP : public ServiceWorkerCacheTest, public testing::WithParamInterface<bool> { - virtual bool MemoryOnly() OVERRIDE { return !GetParam(); } + virtual bool MemoryOnly() override { return !GetParam(); } }; TEST_P(ServiceWorkerCacheTestP, PutNoBody) { diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h index b5178fe..762fb9b 100644 --- a/content/browser/service_worker/service_worker_context_core.h +++ b/content/browser/service_worker/service_worker_context_core.h @@ -108,20 +108,20 @@ class CONTENT_EXPORT ServiceWorkerContextCore virtual ~ServiceWorkerContextCore(); // ServiceWorkerVersion::Listener overrides. - virtual void OnWorkerStarted(ServiceWorkerVersion* version) OVERRIDE; - virtual void OnWorkerStopped(ServiceWorkerVersion* version) OVERRIDE; - virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE; + virtual void OnWorkerStarted(ServiceWorkerVersion* version) override; + virtual void OnWorkerStopped(ServiceWorkerVersion* version) override; + virtual void OnVersionStateChanged(ServiceWorkerVersion* version) override; virtual void OnErrorReported(ServiceWorkerVersion* version, const base::string16& error_message, int line_number, int column_number, - const GURL& source_url) OVERRIDE; + const GURL& source_url) override; virtual void OnReportConsoleMessage(ServiceWorkerVersion* version, int source_identifier, int message_level, const base::string16& message, int line_number, - const GURL& source_url) OVERRIDE; + const GURL& source_url) override; ServiceWorkerStorage* storage() { return storage_.get(); } ServiceWorkerCacheStorageManager* cache_manager() { diff --git a/content/browser/service_worker/service_worker_context_request_handler.h b/content/browser/service_worker/service_worker_context_request_handler.h index 439f7b2..232375d 100644 --- a/content/browser/service_worker/service_worker_context_request_handler.h +++ b/content/browser/service_worker/service_worker_context_request_handler.h @@ -26,7 +26,7 @@ class CONTENT_EXPORT ServiceWorkerContextRequestHandler // Called via custom URLRequestJobFactory. virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) OVERRIDE; + net::NetworkDelegate* network_delegate) override; virtual void GetExtraResponseInfo( bool* was_fetched_via_service_worker, @@ -34,7 +34,7 @@ class CONTENT_EXPORT ServiceWorkerContextRequestHandler GURL* original_url_via_service_worker, base::TimeTicks* fetch_start_time, base::TimeTicks* fetch_ready_time, - base::TimeTicks* fetch_end_time) const OVERRIDE; + base::TimeTicks* fetch_end_time) const override; private: bool ShouldAddToScriptCache(const GURL& url); diff --git a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc index 347e0be..24243a7 100644 --- a/content/browser/service_worker/service_worker_context_request_handler_unittest.cc +++ b/content/browser/service_worker/service_worker_context_request_handler_unittest.cc @@ -34,7 +34,7 @@ class ServiceWorkerContextRequestHandlerTest : public testing::Test { ServiceWorkerContextRequestHandlerTest() : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kMockRenderProcessId)); // A new unstored registration/version. @@ -56,7 +56,7 @@ class ServiceWorkerContextRequestHandlerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = NULL; registration_ = NULL; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc index d9331ee..028f3cb 100644 --- a/content/browser/service_worker/service_worker_context_unittest.cc +++ b/content/browser/service_worker/service_worker_context_unittest.cc @@ -79,7 +79,7 @@ class RejectInstallTestHelper : public EmbeddedWorkerTestHelper { virtual void OnInstallEvent(int embedded_worker_id, int request_id, - int active_version_id) OVERRIDE { + int active_version_id) override { SimulateSend( new ServiceWorkerHostMsg_InstallEventFinished( embedded_worker_id, request_id, @@ -93,7 +93,7 @@ class RejectActivateTestHelper : public EmbeddedWorkerTestHelper { : EmbeddedWorkerTestHelper(mock_render_process_id) {} virtual void OnActivateEvent(int embedded_worker_id, - int request_id) OVERRIDE { + int request_id) override { SimulateSend( new ServiceWorkerHostMsg_ActivateEventFinished( embedded_worker_id, request_id, @@ -109,11 +109,11 @@ class ServiceWorkerContextTest : public testing::Test { : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP), render_process_id_(99) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(render_process_id_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { helper_.reset(); } diff --git a/content/browser/service_worker/service_worker_context_wrapper.h b/content/browser/service_worker/service_worker_context_wrapper.h index 9f6d060..1fb17cc 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.h +++ b/content/browser/service_worker/service_worker_context_wrapper.h @@ -68,13 +68,13 @@ class CONTENT_EXPORT ServiceWorkerContextWrapper virtual void RegisterServiceWorker( const GURL& pattern, const GURL& script_url, - const ResultCallback& continuation) OVERRIDE; + const ResultCallback& continuation) override; virtual void UnregisterServiceWorker(const GURL& pattern, const ResultCallback& continuation) - OVERRIDE; - virtual void Terminate() OVERRIDE; - virtual void GetAllOriginsInfo(const GetUsageInfoCallback& callback) OVERRIDE; - virtual void DeleteForOrigin(const GURL& origin_url) OVERRIDE; + override; + virtual void Terminate() override; + virtual void GetAllOriginsInfo(const GetUsageInfoCallback& callback) override; + virtual void DeleteForOrigin(const GURL& origin_url) override; void AddObserver(ServiceWorkerContextObserver* observer); void RemoveObserver(ServiceWorkerContextObserver* observer); diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.h b/content/browser/service_worker/service_worker_controllee_request_handler.h index 0cf2e04..1348b6f 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler.h +++ b/content/browser/service_worker/service_worker_controllee_request_handler.h @@ -44,7 +44,7 @@ class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler // Called via custom URLRequestJobFactory. virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) OVERRIDE; + net::NetworkDelegate* network_delegate) override; virtual void GetExtraResponseInfo( bool* was_fetched_via_service_worker, @@ -52,7 +52,7 @@ class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler GURL* original_url_via_service_worker, base::TimeTicks* fetch_start_time, base::TimeTicks* fetch_ready_time, - base::TimeTicks* fetch_end_time) const OVERRIDE; + base::TimeTicks* fetch_end_time) const override; private: FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest, diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc index d5ab607..34eb2a3 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc @@ -39,7 +39,7 @@ class ServiceWorkerControlleeRequestHandlerTest : public testing::Test { ServiceWorkerControlleeRequestHandlerTest() : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kMockRenderProcessId)); // A new unstored registration/version. @@ -61,7 +61,7 @@ class ServiceWorkerControlleeRequestHandlerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = NULL; registration_ = NULL; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_dispatcher_host.h b/content/browser/service_worker/service_worker_dispatcher_host.h index b0de2ca..e4b081c 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.h +++ b/content/browser/service_worker/service_worker_dispatcher_host.h @@ -37,9 +37,9 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter { void Init(ServiceWorkerContextWrapper* context_wrapper); // BrowserMessageFilter implementation - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnDestruct() const override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // IPC::Sender implementation @@ -47,7 +47,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter { // class assumes that Send() can only fail after that when the renderer // process has terminated, at which point the whole instance will eventually // be destroyed. - virtual bool Send(IPC::Message* message) OVERRIDE; + virtual bool Send(IPC::Message* message) override; // Returns the existing registration handle whose reference count is // incremented or newly created one if it doesn't exist. diff --git a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc index 428c861..82c1a0e 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc @@ -35,13 +35,13 @@ class TestingServiceWorkerDispatcherHost : public ServiceWorkerDispatcherHost { Init(context_wrapper); } - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { return helper_->Send(message); } IPC::TestSink* ipc_sink() { return helper_->ipc_sink(); } - virtual void BadMessageReceived() OVERRIDE { + virtual void BadMessageReceived() override { ++bad_messages_received_count_; } diff --git a/content/browser/service_worker/service_worker_handle.h b/content/browser/service_worker/service_worker_handle.h index d6671bc..0ab64a8 100644 --- a/content/browser/service_worker/service_worker_handle.h +++ b/content/browser/service_worker/service_worker_handle.h @@ -52,20 +52,20 @@ class CONTENT_EXPORT ServiceWorkerHandle virtual ~ServiceWorkerHandle(); // ServiceWorkerVersion::Listener overrides. - virtual void OnWorkerStarted(ServiceWorkerVersion* version) OVERRIDE; - virtual void OnWorkerStopped(ServiceWorkerVersion* version) OVERRIDE; + virtual void OnWorkerStarted(ServiceWorkerVersion* version) override; + virtual void OnWorkerStopped(ServiceWorkerVersion* version) override; virtual void OnErrorReported(ServiceWorkerVersion* version, const base::string16& error_message, int line_number, int column_number, - const GURL& source_url) OVERRIDE; + const GURL& source_url) override; virtual void OnReportConsoleMessage(ServiceWorkerVersion* version, int source_identifier, int message_level, const base::string16& message, int line_number, - const GURL& source_url) OVERRIDE; - virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE; + const GURL& source_url) override; + virtual void OnVersionStateChanged(ServiceWorkerVersion* version) override; ServiceWorkerObjectInfo GetObjectInfo(); diff --git a/content/browser/service_worker/service_worker_handle_unittest.cc b/content/browser/service_worker/service_worker_handle_unittest.cc index 3368dc1..a6cc0c1 100644 --- a/content/browser/service_worker/service_worker_handle_unittest.cc +++ b/content/browser/service_worker/service_worker_handle_unittest.cc @@ -43,7 +43,7 @@ class ServiceWorkerHandleTest : public testing::Test { ServiceWorkerHandleTest() : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kRenderProcessId)); const GURL pattern("http://www.example.com/"); @@ -60,7 +60,7 @@ class ServiceWorkerHandleTest : public testing::Test { helper_->SimulateAddProcessToPattern(pattern, kRenderProcessId); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { registration_ = NULL; version_ = NULL; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc index 1d2a409..b0e79a1 100644 --- a/content/browser/service_worker/service_worker_internals_ui.cc +++ b/content/browser/service_worker/service_worker_internals_ui.cc @@ -304,7 +304,7 @@ class ServiceWorkerInternalsUI::PartitionObserver // ServiceWorkerContextObserver overrides: virtual void OnWorkerStarted(int64 version_id, int process_id, - int thread_id) OVERRIDE { + int thread_id) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); web_ui_->CallJavascriptFunction( "serviceworker.onWorkerStarted", @@ -315,7 +315,7 @@ class ServiceWorkerInternalsUI::PartitionObserver } virtual void OnWorkerStopped(int64 version_id, int process_id, - int thread_id) OVERRIDE { + int thread_id) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); web_ui_->CallJavascriptFunction( "serviceworker.onWorkerStopped", @@ -324,7 +324,7 @@ class ServiceWorkerInternalsUI::PartitionObserver FundamentalValue(process_id), FundamentalValue(thread_id)); } - virtual void OnVersionStateChanged(int64 version_id) OVERRIDE { + virtual void OnVersionStateChanged(int64 version_id) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); web_ui_->CallJavascriptFunction( "serviceworker.onVersionStateChanged", @@ -334,7 +334,7 @@ class ServiceWorkerInternalsUI::PartitionObserver virtual void OnErrorReported(int64 version_id, int process_id, int thread_id, - const ErrorInfo& info) OVERRIDE { + const ErrorInfo& info) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); ScopedVector<const Value> args; args.push_back(new FundamentalValue(partition_id_)); @@ -353,7 +353,7 @@ class ServiceWorkerInternalsUI::PartitionObserver virtual void OnReportConsoleMessage(int64 version_id, int process_id, int thread_id, - const ConsoleMessage& message) OVERRIDE { + const ConsoleMessage& message) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); ScopedVector<const Value> args; args.push_back(new FundamentalValue(partition_id_)); @@ -370,12 +370,12 @@ class ServiceWorkerInternalsUI::PartitionObserver web_ui_->CallJavascriptFunction("serviceworker.onConsoleMessageReported", args.get()); } - virtual void OnRegistrationStored(const GURL& pattern) OVERRIDE { + virtual void OnRegistrationStored(const GURL& pattern) override { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); web_ui_->CallJavascriptFunction("serviceworker.onRegistrationStored", StringValue(pattern.spec())); } - virtual void OnRegistrationDeleted(const GURL& pattern) OVERRIDE { + virtual void OnRegistrationDeleted(const GURL& pattern) override { web_ui_->CallJavascriptFunction("serviceworker.onRegistrationDeleted", StringValue(pattern.spec())); } diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc index 976f5bd..85b1488 100644 --- a/content/browser/service_worker/service_worker_job_unittest.cc +++ b/content/browser/service_worker/service_worker_job_unittest.cc @@ -102,11 +102,11 @@ class ServiceWorkerJobTest : public testing::Test { : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP), render_process_id_(kMockRenderProcessId) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(render_process_id_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { helper_.reset(); } @@ -408,7 +408,7 @@ class FailToStartWorkerTestHelper : public EmbeddedWorkerTestHelper { int64 service_worker_version_id, const GURL& scope, const GURL& script_url, - bool pause_after_download) OVERRIDE { + bool pause_after_download) override { EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id); } @@ -931,7 +931,7 @@ class UpdateJobTestHelper int64 version_id, const GURL& scope, const GURL& script, - bool pause_after_download) OVERRIDE { + bool pause_after_download) override { const std::string kMockScriptBody = "mock_script"; ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); ASSERT_TRUE(version); @@ -963,7 +963,7 @@ class UpdateJobTestHelper virtual void OnVersionAttributesChanged( ServiceWorkerRegistration* registration, ChangedVersionAttributesMask changed_mask, - const ServiceWorkerRegistrationInfo& info) OVERRIDE { + const ServiceWorkerRegistrationInfo& info) override { AttributeChangeLogEntry entry; entry.registration_id = registration->id(); entry.mask = changed_mask; @@ -972,23 +972,23 @@ class UpdateJobTestHelper } virtual void OnRegistrationFailed( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { NOTREACHED(); } virtual void OnRegistrationFinishedUninstalling( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { NOTREACHED(); } virtual void OnUpdateFound( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { ASSERT_FALSE(update_found_); update_found_ = true; } // ServiceWorkerVersion::Listener overrides - virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE { + virtual void OnVersionStateChanged(ServiceWorkerVersion* version) override { StateChangeLogEntry entry; entry.version_id = version->version_id(); entry.status = version->status(); diff --git a/content/browser/service_worker/service_worker_process_manager_unittest.cc b/content/browser/service_worker/service_worker_process_manager_unittest.cc index aedc1eb..99681e7 100644 --- a/content/browser/service_worker/service_worker_process_manager_unittest.cc +++ b/content/browser/service_worker/service_worker_process_manager_unittest.cc @@ -15,12 +15,12 @@ class ServiceWorkerProcessManagerTest : public testing::Test { public: ServiceWorkerProcessManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { process_manager_.reset(new ServiceWorkerProcessManager(NULL)); pattern_ = GURL("http://www.example.com/"); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { process_manager_.reset(); } diff --git a/content/browser/service_worker/service_worker_provider_host.h b/content/browser/service_worker/service_worker_provider_host.h index 5a0f804..995d3e4 100644 --- a/content/browser/service_worker/service_worker_provider_host.h +++ b/content/browser/service_worker/service_worker_provider_host.h @@ -133,7 +133,7 @@ class CONTENT_EXPORT ServiceWorkerProviderHost // ServiceWorkerRegistration::Listener overrides. virtual void OnRegistrationFailed( - ServiceWorkerRegistration* registration) OVERRIDE; + ServiceWorkerRegistration* registration) override; // Sets the controller version field to |version| or if |version| is NULL, // clears the field. diff --git a/content/browser/service_worker/service_worker_provider_host_unittest.cc b/content/browser/service_worker/service_worker_provider_host_unittest.cc index a29495f..000cb43 100644 --- a/content/browser/service_worker/service_worker_provider_host_unittest.cc +++ b/content/browser/service_worker/service_worker_provider_host_unittest.cc @@ -24,7 +24,7 @@ class ServiceWorkerProviderHostTest : public testing::Test { : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} virtual ~ServiceWorkerProviderHostTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kRenderProcessId)); context_ = helper_->context(); pattern_ = GURL("http://www.example.com/"); @@ -47,7 +47,7 @@ class ServiceWorkerProviderHostTest : public testing::Test { context_->AddProviderHost(make_scoped_ptr(host2.release())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = 0; registration_ = 0; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_read_from_cache_job.h b/content/browser/service_worker/service_worker_read_from_cache_job.h index c77a90a..e919d25 100644 --- a/content/browser/service_worker/service_worker_read_from_cache_job.h +++ b/content/browser/service_worker/service_worker_read_from_cache_job.h @@ -35,18 +35,18 @@ class CONTENT_EXPORT ServiceWorkerReadFromCacheJob virtual ~ServiceWorkerReadFromCacheJob(); // net::URLRequestJob overrides - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual net::LoadState GetLoadState() const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + virtual void Start() override; + virtual void Kill() override; + virtual net::LoadState GetLoadState() const override; + virtual bool GetCharset(std::string* charset) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(net::HttpResponseInfo* info) override; + virtual int GetResponseCode() const override; virtual void SetExtraRequestHeaders( - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; + int *bytes_read) override; // Reader completion callbacks. void OnReadInfoComplete(int result); diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h index fa143e2..a6e27c1 100644 --- a/content/browser/service_worker/service_worker_register_job.h +++ b/content/browser/service_worker/service_worker_register_job.h @@ -61,10 +61,10 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase, ServiceWorkerProviderHost* provider_host); // ServiceWorkerRegisterJobBase implementation: - virtual void Start() OVERRIDE; - virtual void Abort() OVERRIDE; - virtual bool Equals(ServiceWorkerRegisterJobBase* job) OVERRIDE; - virtual RegistrationJobType GetType() OVERRIDE; + virtual void Start() override; + virtual void Abort() override; + virtual bool Equals(ServiceWorkerRegisterJobBase* job) override; + virtual RegistrationJobType GetType() override; private: FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostWaitingVersionTest, @@ -134,12 +134,12 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase, ServiceWorkerRegistration* registration); // EmbeddedWorkerInstance::Listener override of OnPausedAfterDownload. - virtual void OnPausedAfterDownload() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnPausedAfterDownload() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // ServiceWorkerRegistration::Listener overrides virtual void OnRegistrationFinishedUninstalling( - ServiceWorkerRegistration* registration) OVERRIDE; + ServiceWorkerRegistration* registration) override; void OnCompareScriptResourcesComplete( ServiceWorkerStatusCode status, diff --git a/content/browser/service_worker/service_worker_registration.h b/content/browser/service_worker/service_worker_registration.h index bf220d3..520974d 100644 --- a/content/browser/service_worker/service_worker_registration.h +++ b/content/browser/service_worker/service_worker_registration.h @@ -121,7 +121,7 @@ class CONTENT_EXPORT ServiceWorkerRegistration ChangedVersionAttributesMask* mask); // ServiceWorkerVersion::Listener override. - virtual void OnNoControllees(ServiceWorkerVersion* version) OVERRIDE; + virtual void OnNoControllees(ServiceWorkerVersion* version) override; // This method corresponds to the [[Activate]] algorithm. void ActivateWaitingVersion(); diff --git a/content/browser/service_worker/service_worker_registration_handle.h b/content/browser/service_worker/service_worker_registration_handle.h index d6d7e05..d30a99c 100644 --- a/content/browser/service_worker/service_worker_registration_handle.h +++ b/content/browser/service_worker/service_worker_registration_handle.h @@ -51,11 +51,11 @@ class ServiceWorkerRegistrationHandle virtual void OnVersionAttributesChanged( ServiceWorkerRegistration* registration, ChangedVersionAttributesMask changed_mask, - const ServiceWorkerRegistrationInfo& info) OVERRIDE; + const ServiceWorkerRegistrationInfo& info) override; virtual void OnRegistrationFailed( - ServiceWorkerRegistration* registration) OVERRIDE; + ServiceWorkerRegistration* registration) override; virtual void OnUpdateFound( - ServiceWorkerRegistration* registration) OVERRIDE; + ServiceWorkerRegistration* registration) override; // Sets the corresponding version field to the given version or if the given // version is NULL, clears the field. diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc index c389774..5ea175b 100644 --- a/content/browser/service_worker/service_worker_registration_unittest.cc +++ b/content/browser/service_worker/service_worker_registration_unittest.cc @@ -22,7 +22,7 @@ class ServiceWorkerRegistrationTest : public testing::Test { ServiceWorkerRegistrationTest() : io_thread_(BrowserThread::IO, &message_loop_) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { context_.reset( new ServiceWorkerContextCore(base::FilePath(), base::ThreadTaskRunnerHandle::Get(), @@ -34,7 +34,7 @@ class ServiceWorkerRegistrationTest : public testing::Test { context_ptr_ = context_->AsWeakPtr(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { context_.reset(); base::RunLoop().RunUntilIdle(); } @@ -50,24 +50,24 @@ class ServiceWorkerRegistrationTest : public testing::Test { virtual void OnVersionAttributesChanged( ServiceWorkerRegistration* registration, ChangedVersionAttributesMask changed_mask, - const ServiceWorkerRegistrationInfo& info) OVERRIDE { + const ServiceWorkerRegistrationInfo& info) override { observed_registration_ = registration; observed_changed_mask_ = changed_mask; observed_info_ = info; } virtual void OnRegistrationFailed( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { NOTREACHED(); } virtual void OnRegistrationFinishedUninstalling( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { NOTREACHED(); } virtual void OnUpdateFound( - ServiceWorkerRegistration* registration) OVERRIDE { + ServiceWorkerRegistration* registration) override { NOTREACHED(); } diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc index f9ae60e..dd92f44 100644 --- a/content/browser/service_worker/service_worker_request_handler.cc +++ b/content/browser/service_worker/service_worker_request_handler.cc @@ -32,7 +32,7 @@ class ServiceWorkerRequestInterceptor virtual ~ServiceWorkerRequestInterceptor() {} virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { ServiceWorkerRequestHandler* handler = ServiceWorkerRequestHandler::GetHandler(request); if (!handler) diff --git a/content/browser/service_worker/service_worker_request_handler_unittest.cc b/content/browser/service_worker/service_worker_request_handler_unittest.cc index 419d25c..3c1a546 100644 --- a/content/browser/service_worker/service_worker_request_handler_unittest.cc +++ b/content/browser/service_worker/service_worker_request_handler_unittest.cc @@ -37,7 +37,7 @@ class ServiceWorkerRequestHandlerTest : public testing::Test { ServiceWorkerRequestHandlerTest() : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new EmbeddedWorkerTestHelper(kMockRenderProcessId)); // A new unstored registration/version. @@ -67,7 +67,7 @@ class ServiceWorkerRequestHandlerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = NULL; registration_ = NULL; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc index ea61502..c6687a6 100644 --- a/content/browser/service_worker/service_worker_storage_unittest.cc +++ b/content/browser/service_worker/service_worker_storage_unittest.cc @@ -191,7 +191,7 @@ class ServiceWorkerStorageTest : public testing::Test { : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { context_.reset( new ServiceWorkerContextCore(GetUserDataDirectory(), base::ThreadTaskRunnerHandle::Get(), @@ -203,7 +203,7 @@ class ServiceWorkerStorageTest : public testing::Test { context_ptr_ = context_->AsWeakPtr(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { context_.reset(); } @@ -544,7 +544,7 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) { class ServiceWorkerResourceStorageTest : public ServiceWorkerStorageTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ServiceWorkerStorageTest::SetUp(); storage()->LazyInitialize(base::Bind(&base::DoNothing)); @@ -612,12 +612,12 @@ class ServiceWorkerResourceStorageTest : public ServiceWorkerStorageTest { class ServiceWorkerResourceStorageDiskTest : public ServiceWorkerResourceStorageTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(user_data_directory_.CreateUniqueTempDir()); ServiceWorkerResourceStorageTest::SetUp(); } - virtual base::FilePath GetUserDataDirectory() OVERRIDE { + virtual base::FilePath GetUserDataDirectory() override { return user_data_directory_.path(); } diff --git a/content/browser/service_worker/service_worker_unregister_job.h b/content/browser/service_worker/service_worker_unregister_job.h index 5e627ae..6a4899f 100644 --- a/content/browser/service_worker/service_worker_unregister_job.h +++ b/content/browser/service_worker/service_worker_unregister_job.h @@ -39,10 +39,10 @@ class ServiceWorkerUnregisterJob : public ServiceWorkerRegisterJobBase { void AddCallback(const UnregistrationCallback& callback); // ServiceWorkerRegisterJobBase implementation: - virtual void Start() OVERRIDE; - virtual void Abort() OVERRIDE; - virtual bool Equals(ServiceWorkerRegisterJobBase* job) OVERRIDE; - virtual RegistrationJobType GetType() OVERRIDE; + virtual void Start() override; + virtual void Abort() override; + virtual bool Equals(ServiceWorkerRegisterJobBase* job) override; + virtual RegistrationJobType GetType() override; private: void OnRegistrationFound( diff --git a/content/browser/service_worker/service_worker_url_request_job.h b/content/browser/service_worker/service_worker_url_request_job.h index 56a7bec..d3ea44c 100644 --- a/content/browser/service_worker/service_worker_url_request_job.h +++ b/content/browser/service_worker/service_worker_url_request_job.h @@ -59,39 +59,39 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob } // net::URLRequestJob overrides: - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual net::LoadState GetLoadState() const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; + virtual void Start() override; + virtual void Kill() override; + virtual net::LoadState GetLoadState() const override; + virtual bool GetCharset(std::string* charset) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(net::HttpResponseInfo* info) override; virtual void GetLoadTimingInfo( - net::LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + net::LoadTimingInfo* load_timing_info) const override; + virtual int GetResponseCode() const override; virtual void SetExtraRequestHeaders( - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; + int *bytes_read) override; // net::URLRequest::Delegate overrides that read the blob from the // ServiceWorkerFetchResponse. virtual void OnReceivedRedirect(net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE; + bool* defer_redirect) override; virtual void OnAuthRequired(net::URLRequest* request, - net::AuthChallengeInfo* auth_info) OVERRIDE; + net::AuthChallengeInfo* auth_info) override; virtual void OnCertificateRequested( net::URLRequest* request, - net::SSLCertRequestInfo* cert_request_info) OVERRIDE; + net::SSLCertRequestInfo* cert_request_info) override; virtual void OnSSLCertificateError(net::URLRequest* request, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE; + bool fatal) override; virtual void OnBeforeNetworkStart(net::URLRequest* request, - bool* defer) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + bool* defer) override; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted(net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; const net::HttpResponseInfo* http_info() const; diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc index d7d208c..12b4d58 100644 --- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc +++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc @@ -59,7 +59,7 @@ class MockHttpProtocolHandler virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { ServiceWorkerURLRequestJob* job = new ServiceWorkerURLRequestJob(request, network_delegate, @@ -98,7 +98,7 @@ class ServiceWorkerURLRequestJobTest : public testing::Test { blob_data_(new storage::BlobData("blob-id:myblob")) {} virtual ~ServiceWorkerURLRequestJobTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { browser_context_.reset(new TestBrowserContext); SetUpWithHelper(new EmbeddedWorkerTestHelper(kProcessID)); } @@ -141,7 +141,7 @@ class ServiceWorkerURLRequestJobTest : public testing::Test { helper_->context()->AddProviderHost(provider_host.Pass()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = NULL; registration_ = NULL; helper_.reset(); @@ -201,7 +201,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper { protected: virtual void OnFetchEvent(int embedded_worker_id, int request_id, - const ServiceWorkerFetchRequest& request) OVERRIDE { + const ServiceWorkerFetchRequest& request) override { SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished( embedded_worker_id, request_id, diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h index a7df195..7195bfb 100644 --- a/content/browser/service_worker/service_worker_version.h +++ b/content/browser/service_worker/service_worker_version.h @@ -232,18 +232,18 @@ class CONTENT_EXPORT ServiceWorkerVersion virtual ~ServiceWorkerVersion(); // EmbeddedWorkerInstance::Listener overrides: - virtual void OnStarted() OVERRIDE; - virtual void OnStopped() OVERRIDE; + virtual void OnStarted() override; + virtual void OnStopped() override; virtual void OnReportException(const base::string16& error_message, int line_number, int column_number, - const GURL& source_url) OVERRIDE; + const GURL& source_url) override; virtual void OnReportConsoleMessage(int source_identifier, int message_level, const base::string16& message, int line_number, - const GURL& source_url) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + const GURL& source_url) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnStartMessageSent(ServiceWorkerStatusCode status); diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc index 10d9774..ff95ad2 100644 --- a/content/browser/service_worker/service_worker_version_unittest.cc +++ b/content/browser/service_worker/service_worker_version_unittest.cc @@ -40,7 +40,7 @@ class MessageReceiver : public EmbeddedWorkerTestHelper { virtual bool OnMessageToWorker(int thread_id, int embedded_worker_id, - const IPC::Message& message) OVERRIDE { + const IPC::Message& message) override { if (EmbeddedWorkerTestHelper::OnMessageToWorker( thread_id, embedded_worker_id, message)) { return true; @@ -89,9 +89,9 @@ class MessageReceiverFromWorker : public EmbeddedWorkerInstance::Listener { instance_->RemoveListener(this); } - virtual void OnStarted() OVERRIDE { NOTREACHED(); } - virtual void OnStopped() OVERRIDE { NOTREACHED(); } - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual void OnStarted() override { NOTREACHED(); } + virtual void OnStopped() override { NOTREACHED(); } + virtual bool OnMessageReceived(const IPC::Message& message) override { bool handled = true; IPC_BEGIN_MESSAGE_MAP(MessageReceiverFromWorker, message) IPC_MESSAGE_HANDLER(TestMsg_MessageFromWorker, OnMessageFromWorker) @@ -116,7 +116,7 @@ class ServiceWorkerVersionTest : public testing::Test { ServiceWorkerVersionTest() : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { helper_.reset(new MessageReceiver()); pattern_ = GURL("http://www.example.com/"); @@ -136,7 +136,7 @@ class ServiceWorkerVersionTest : public testing::Test { ->PatternHasProcessToRun(pattern_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { version_ = 0; registration_ = 0; helper_.reset(); diff --git a/content/browser/service_worker/service_worker_write_to_cache_job.h b/content/browser/service_worker/service_worker_write_to_cache_job.h index 7506c6c..be4e4e9 100644 --- a/content/browser/service_worker/service_worker_write_to_cache_job.h +++ b/content/browser/service_worker/service_worker_write_to_cache_job.h @@ -52,18 +52,18 @@ class CONTENT_EXPORT ServiceWorkerWriteToCacheJob virtual ~ServiceWorkerWriteToCacheJob(); // net::URLRequestJob overrides - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; - virtual net::LoadState GetLoadState() const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + virtual void Start() override; + virtual void Kill() override; + virtual net::LoadState GetLoadState() const override; + virtual bool GetCharset(std::string* charset) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(net::HttpResponseInfo* info) override; + virtual int GetResponseCode() const override; virtual void SetExtraRequestHeaders( - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; + int *bytes_read) override; const net::HttpResponseInfo* http_info() const; @@ -84,24 +84,24 @@ class CONTENT_EXPORT ServiceWorkerWriteToCacheJob virtual void OnReceivedRedirect( net::URLRequest* request, const net::RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE; + bool* defer_redirect) override; virtual void OnAuthRequired( net::URLRequest* request, - net::AuthChallengeInfo* auth_info) OVERRIDE; + net::AuthChallengeInfo* auth_info) override; virtual void OnCertificateRequested( net::URLRequest* request, - net::SSLCertRequestInfo* cert_request_info) OVERRIDE; + net::SSLCertRequestInfo* cert_request_info) override; virtual void OnSSLCertificateError( net::URLRequest* request, const net::SSLInfo& ssl_info, - bool fatal) OVERRIDE; + bool fatal) override; virtual void OnBeforeNetworkStart( net::URLRequest* request, - bool* defer) OVERRIDE; - virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; + bool* defer) override; + virtual void OnResponseStarted(net::URLRequest* request) override; virtual void OnReadCompleted( net::URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; void AsyncNotifyDoneHelper(const net::URLRequestStatus& status); diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index 4465510..9e2bb66 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -47,7 +47,7 @@ class SessionHistoryTest : public ContentBrowserTest { protected: SessionHistoryTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); embedded_test_server()->RegisterRequestHandler( base::Bind(&HandleEchoTitleRequest, "/echotitle")); diff --git a/content/browser/signed_certificate_timestamp_store_impl.h b/content/browser/signed_certificate_timestamp_store_impl.h index 4cd98cc..5600775 100644 --- a/content/browser/signed_certificate_timestamp_store_impl.h +++ b/content/browser/signed_certificate_timestamp_store_impl.h @@ -22,10 +22,10 @@ class SignedCertificateTimestampStoreImpl // SignedCertificateTimestampStore implementation: virtual int Store( net::ct::SignedCertificateTimestamp* sct, - int render_process_host_id) OVERRIDE; + int render_process_host_id) override; virtual bool Retrieve( int sct_id, - scoped_refptr<net::ct::SignedCertificateTimestamp>* sct) OVERRIDE; + scoped_refptr<net::ct::SignedCertificateTimestamp>* sct) override; private: friend struct DefaultSingletonTraits<SignedCertificateTimestampStoreImpl>; diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h index 9086e09..35d1a1e 100644 --- a/content/browser/site_instance_impl.h +++ b/content/browser/site_instance_impl.h @@ -19,14 +19,14 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance, public RenderProcessHostObserver { public: // SiteInstance interface overrides. - virtual int32 GetId() OVERRIDE; - virtual bool HasProcess() const OVERRIDE; - virtual RenderProcessHost* GetProcess() OVERRIDE; - virtual BrowserContext* GetBrowserContext() const OVERRIDE; - virtual const GURL& GetSiteURL() const OVERRIDE; - virtual SiteInstance* GetRelatedSiteInstance(const GURL& url) OVERRIDE; - virtual bool IsRelatedSiteInstance(const SiteInstance* instance) OVERRIDE; - virtual size_t GetRelatedActiveContentsCount() OVERRIDE; + virtual int32 GetId() override; + virtual bool HasProcess() const override; + virtual RenderProcessHost* GetProcess() override; + virtual BrowserContext* GetBrowserContext() const override; + virtual const GURL& GetSiteURL() const override; + virtual SiteInstance* GetRelatedSiteInstance(const GURL& url) override; + virtual bool IsRelatedSiteInstance(const SiteInstance* instance) override; + virtual size_t GetRelatedActiveContentsCount() override; // Set the web site that this SiteInstance is rendering pages for. // This includes the scheme and registered domain, but not the port. If the @@ -98,7 +98,7 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance, private: // RenderProcessHostObserver implementation. - virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE; + virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override; // Used to restrict a process' origin access rights. void LockToOrigin(); diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index e547e7b..0eff9f9 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -37,19 +37,19 @@ const char kPrivilegedScheme[] = "privileged"; class SiteInstanceTestWebUIControllerFactory : public WebUIControllerFactory { public: virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const OVERRIDE { + WebUI* web_ui, const GURL& url) const override { return NULL; } virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return WebUI::kNoWebUI; } virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return HasWebUIScheme(url); } virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return HasWebUIScheme(url); } }; @@ -66,7 +66,7 @@ class SiteInstanceTestBrowserClient : public TestContentBrowserClient { } virtual bool IsSuitableHost(RenderProcessHost* process_host, - const GURL& site_url) OVERRIDE { + const GURL& site_url) override { return (privileged_process_id_ == process_host->GetID()) == site_url.SchemeIs(kPrivilegedScheme); } diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 611cb5b..32c9cb0 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -38,7 +38,7 @@ class SitePerProcessWebContentsObserver: public WebContentsObserver { RenderFrameHost* render_frame_host, const GURL& validated_url, bool is_error_page, - bool is_iframe_srcdoc) OVERRIDE { + bool is_iframe_srcdoc) override { navigation_succeeded_ = false; } @@ -46,7 +46,7 @@ class SitePerProcessWebContentsObserver: public WebContentsObserver { RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description) OVERRIDE { + const base::string16& error_description) override { navigation_url_ = validated_url; navigation_succeeded_ = false; } @@ -54,7 +54,7 @@ class SitePerProcessWebContentsObserver: public WebContentsObserver { virtual void DidCommitProvisionalLoadForFrame( RenderFrameHost* render_frame_host, const GURL& url, - ui::PageTransition transition_type) OVERRIDE { + ui::PageTransition transition_type) override { navigation_url_ = url; navigation_succeeded_ = true; } @@ -99,7 +99,7 @@ class RedirectNotificationObserver : public NotificationObserver { // NotificationObserver: virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const NotificationDetails& details) override; private: bool seen_; diff --git a/content/browser/site_per_process_browsertest.h b/content/browser/site_per_process_browsertest.h index 43625a0..c059d01 100644 --- a/content/browser/site_per_process_browsertest.h +++ b/content/browser/site_per_process_browsertest.h @@ -23,8 +23,8 @@ class SitePerProcessBrowserTest : public ContentBrowserTest { const GURL& url, std::string iframe_id); - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(base::CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; }; } // namespace content diff --git a/content/browser/startup_task_runner_unittest.cc b/content/browser/startup_task_runner_unittest.cc index fcd2b3d..04b93ea 100644 --- a/content/browser/startup_task_runner_unittest.cc +++ b/content/browser/startup_task_runner_unittest.cc @@ -96,16 +96,16 @@ class MockTaskRunner { class TaskRunnerProxy : public base::SingleThreadTaskRunner { public: TaskRunnerProxy(MockTaskRunner* mock) : mock_(mock) {} - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } + virtual bool RunsTasksOnCurrentThread() const override { return true; } virtual bool PostDelayedTask(const tracked_objects::Location& location, const Closure& closure, - base::TimeDelta delta) OVERRIDE { + base::TimeDelta delta) override { return mock_->PostDelayedTask(location, closure, delta); } virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& location, const Closure& closure, - base::TimeDelta delta) OVERRIDE { + base::TimeDelta delta) override { return mock_->PostNonNestableDelayedTask(location, closure, delta); } diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h index 1136057..f8fda1c 100644 --- a/content/browser/storage_partition_impl.h +++ b/content/browser/storage_partition_impl.h @@ -33,30 +33,30 @@ class StoragePartitionImpl : public StoragePartition { storage::SpecialStoragePolicy* special_storage_policy); // StoragePartition interface. - virtual base::FilePath GetPath() OVERRIDE; - virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE; - virtual net::URLRequestContextGetter* GetMediaURLRequestContext() OVERRIDE; - virtual storage::QuotaManager* GetQuotaManager() OVERRIDE; - virtual ChromeAppCacheService* GetAppCacheService() OVERRIDE; - virtual storage::FileSystemContext* GetFileSystemContext() OVERRIDE; - virtual storage::DatabaseTracker* GetDatabaseTracker() OVERRIDE; - virtual DOMStorageContextWrapper* GetDOMStorageContext() OVERRIDE; - virtual IndexedDBContextImpl* GetIndexedDBContext() OVERRIDE; - virtual ServiceWorkerContextWrapper* GetServiceWorkerContext() OVERRIDE; + virtual base::FilePath GetPath() override; + virtual net::URLRequestContextGetter* GetURLRequestContext() override; + virtual net::URLRequestContextGetter* GetMediaURLRequestContext() override; + virtual storage::QuotaManager* GetQuotaManager() override; + virtual ChromeAppCacheService* GetAppCacheService() override; + virtual storage::FileSystemContext* GetFileSystemContext() override; + virtual storage::DatabaseTracker* GetDatabaseTracker() override; + virtual DOMStorageContextWrapper* GetDOMStorageContext() override; + virtual IndexedDBContextImpl* GetIndexedDBContext() override; + virtual ServiceWorkerContextWrapper* GetServiceWorkerContext() override; virtual void ClearDataForOrigin( uint32 remove_mask, uint32 quota_storage_remove_mask, const GURL& storage_origin, net::URLRequestContextGetter* request_context_getter, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void ClearData(uint32 remove_mask, uint32 quota_storage_remove_mask, const GURL& storage_origin, const OriginMatcherFunction& origin_matcher, const base::Time begin, const base::Time end, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; WebRTCIdentityStore* GetWebRTCIdentityStore(); diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index 82c119a..9042d17 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.cc @@ -62,7 +62,7 @@ class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { scoped_refptr<Stream> stream = stream_context_->registry()->GetStream(request->url()); if (stream.get()) diff --git a/content/browser/streams/stream_handle_impl.h b/content/browser/streams/stream_handle_impl.h index dc64dad..762aaeb 100644 --- a/content/browser/streams/stream_handle_impl.h +++ b/content/browser/streams/stream_handle_impl.h @@ -29,11 +29,11 @@ class StreamHandleImpl : public StreamHandle { private: // StreamHandle overrides - virtual const GURL& GetURL() OVERRIDE; - virtual const GURL& GetOriginalURL() OVERRIDE; - virtual const std::string& GetMimeType() OVERRIDE; - virtual scoped_refptr<net::HttpResponseHeaders> GetResponseHeaders() OVERRIDE; - virtual void AddCloseListener(const base::Closure& callback) OVERRIDE; + virtual const GURL& GetURL() override; + virtual const GURL& GetOriginalURL() override; + virtual const std::string& GetMimeType() override; + virtual scoped_refptr<net::HttpResponseHeaders> GetResponseHeaders() override; + virtual void AddCloseListener(const base::Closure& callback) override; base::WeakPtr<Stream> stream_; GURL url_; diff --git a/content/browser/streams/stream_unittest.cc b/content/browser/streams/stream_unittest.cc index a2d9593..0b93ab0 100644 --- a/content/browser/streams/stream_unittest.cc +++ b/content/browser/streams/stream_unittest.cc @@ -16,7 +16,7 @@ class StreamTest : public testing::Test { public: StreamTest() : producing_seed_key_(0) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { registry_.reset(new StreamRegistry()); } @@ -76,7 +76,7 @@ class TestStreamReader : public StreamReadObserver { } } - virtual void OnDataAvailable(Stream* stream) OVERRIDE { + virtual void OnDataAvailable(Stream* stream) override { Read(stream); } @@ -102,10 +102,10 @@ class TestStreamWriter : public StreamWriteObserver { stream->AddData(buffer, buffer_size); } - virtual void OnSpaceAvailable(Stream* stream) OVERRIDE { + virtual void OnSpaceAvailable(Stream* stream) override { } - virtual void OnClose(Stream* stream) OVERRIDE { + virtual void OnClose(Stream* stream) override { } }; diff --git a/content/browser/streams/stream_url_request_job.h b/content/browser/streams/stream_url_request_job.h index 03187bf..84d7ad0 100644 --- a/content/browser/streams/stream_url_request_job.h +++ b/content/browser/streams/stream_url_request_job.h @@ -24,19 +24,19 @@ class CONTENT_EXPORT StreamURLRequestJob scoped_refptr<Stream> stream); // StreamObserver methods. - virtual void OnDataAvailable(Stream* stream) OVERRIDE; + virtual void OnDataAvailable(Stream* stream) override; // net::URLRequestJob methods. - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual void Start() override; + virtual void Kill() override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + int* bytes_read) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(net::HttpResponseInfo* info) override; + virtual int GetResponseCode() const override; virtual void SetExtraRequestHeaders( - const net::HttpRequestHeaders& headers) OVERRIDE; + const net::HttpRequestHeaders& headers) override; protected: virtual ~StreamURLRequestJob(); diff --git a/content/browser/streams/stream_url_request_job_unittest.cc b/content/browser/streams/stream_url_request_job_unittest.cc index 035a588..0929fc3 100644 --- a/content/browser/streams/stream_url_request_job_unittest.cc +++ b/content/browser/streams/stream_url_request_job_unittest.cc @@ -40,7 +40,7 @@ class StreamURLRequestJobTest : public testing::Test { // net::URLRequestJobFactory::ProtocolHandler override. virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { scoped_refptr<Stream> stream = registry_->GetStream(request->url()); if (stream.get()) return new StreamURLRequestJob(request, network_delegate, stream); diff --git a/content/browser/system_message_window_win_unittest.cc b/content/browser/system_message_window_win_unittest.cc index 25c77c9d..f317f7b 100644 --- a/content/browser/system_message_window_win_unittest.cc +++ b/content/browser/system_message_window_win_unittest.cc @@ -21,7 +21,7 @@ class SystemMessageWindowWinTest : public testing::Test { virtual ~SystemMessageWindowWinTest() { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { system_monitor_.AddDevicesChangedObserver(&observer_); } diff --git a/content/browser/tcmalloc_internals_request_job.h b/content/browser/tcmalloc_internals_request_job.h index 20b2d4f..22a3eb8 100644 --- a/content/browser/tcmalloc_internals_request_job.h +++ b/content/browser/tcmalloc_internals_request_job.h @@ -53,7 +53,7 @@ class TcmallocInternalsRequestJob : public net::URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const net::CompletionCallback& callback) const OVERRIDE; + const net::CompletionCallback& callback) const override; protected: virtual ~TcmallocInternalsRequestJob() {} diff --git a/content/browser/theme_helper_mac.h b/content/browser/theme_helper_mac.h index 565903b..3b0e144 100644 --- a/content/browser/theme_helper_mac.h +++ b/content/browser/theme_helper_mac.h @@ -38,7 +38,7 @@ class ThemeHelperMac : public NotificationObserver { // Overridden from NotificationObserver: virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const NotificationDetails& details) override; NotificationRegistrar registrar_; diff --git a/content/browser/time_zone_monitor_chromeos.cc b/content/browser/time_zone_monitor_chromeos.cc index 6fc885e..8c6aa0b 100644 --- a/content/browser/time_zone_monitor_chromeos.cc +++ b/content/browser/time_zone_monitor_chromeos.cc @@ -21,7 +21,7 @@ class TimeZoneMonitorChromeOS } // chromeos::system::TimezoneSettings::Observer implementation. - virtual void TimezoneChanged(const icu::TimeZone& time_zone) OVERRIDE { + virtual void TimezoneChanged(const icu::TimeZone& time_zone) override { NotifyRenderers(); } diff --git a/content/browser/time_zone_monitor_win.cc b/content/browser/time_zone_monitor_win.cc index 6d99b94..2e8f9a5 100644 --- a/content/browser/time_zone_monitor_win.cc +++ b/content/browser/time_zone_monitor_win.cc @@ -26,7 +26,7 @@ class TimeZoneMonitorWin : public TimeZoneMonitor, virtual void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, - LPARAM lparam) OVERRIDE { + LPARAM lparam) override { if (message != WM_TIMECHANGE) { return; } diff --git a/content/browser/tracing/trace_message_filter.h b/content/browser/tracing/trace_message_filter.h index 8e13989..ac129c0 100644 --- a/content/browser/tracing/trace_message_filter.h +++ b/content/browser/tracing/trace_message_filter.h @@ -21,8 +21,8 @@ class TraceMessageFilter : public BrowserMessageFilter { TraceMessageFilter(); // BrowserMessageFilter implementation. - virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnChannelClosing() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; void SendBeginTracing(const base::debug::CategoryFilter& category_filter_str, const base::debug::TraceOptions& options); diff --git a/content/browser/tracing/trace_uploader.h b/content/browser/tracing/trace_uploader.h index bfdd40f..bfc4385 100644 --- a/content/browser/tracing/trace_uploader.h +++ b/content/browser/tracing/trace_uploader.h @@ -46,9 +46,9 @@ class TraceUploader : public net::URLFetcherDelegate { virtual ~TraceUploader(); // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) override; virtual void OnURLFetchUploadProgress(const net::URLFetcher* source, - int64 current, int64 total) OVERRIDE; + int64 current, int64 total) override; // Compresses and uploads the given file contents. void DoUpload(const std::string& file_contents, diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc index 305a22c..8313709 100644 --- a/content/browser/tracing/tracing_controller_browsertest.cc +++ b/content/browser/tracing/tracing_controller_browsertest.cc @@ -22,7 +22,7 @@ class TracingControllerTest : public ContentBrowserTest { public: TracingControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { get_categories_done_callback_count_ = 0; enable_recording_done_callback_count_ = 0; disable_recording_done_callback_count_ = 0; @@ -32,7 +32,7 @@ class TracingControllerTest : public ContentBrowserTest { ContentBrowserTest::SetUp(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ContentBrowserTest::TearDown(); } diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc index 2362a15..06826c4 100644 --- a/content/browser/tracing/tracing_controller_impl.cc +++ b/content/browser/tracing/tracing_controller_impl.cc @@ -43,7 +43,7 @@ class FileTraceDataSink : public TracingController::TraceDataSink { completion_callback_(callback), file_(NULL) {} - virtual void AddTraceChunk(const std::string& chunk) OVERRIDE { + virtual void AddTraceChunk(const std::string& chunk) override { std::string tmp = chunk; scoped_refptr<base::RefCountedString> chunk_ptr = base::RefCountedString::TakeString(&tmp); @@ -53,10 +53,10 @@ class FileTraceDataSink : public TracingController::TraceDataSink { base::Bind( &FileTraceDataSink::AddTraceChunkOnFileThread, this, chunk_ptr)); } - virtual void SetSystemTrace(const std::string& data) OVERRIDE { + virtual void SetSystemTrace(const std::string& data) override { system_trace_ = data; } - virtual void Close() OVERRIDE { + virtual void Close() override { BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, @@ -127,15 +127,15 @@ class StringTraceDataSink : public TracingController::TraceDataSink { : completion_callback_(callback) {} // TracingController::TraceDataSink implementation - virtual void AddTraceChunk(const std::string& chunk) OVERRIDE { + virtual void AddTraceChunk(const std::string& chunk) override { if (!trace_.empty()) trace_ += ","; trace_ += chunk; } - virtual void SetSystemTrace(const std::string& data) OVERRIDE { + virtual void SetSystemTrace(const std::string& data) override { system_trace_ = data; } - virtual void Close() OVERRIDE { + virtual void Close() override { std::string result = "{\"traceEvents\":[" + trace_ + "]"; if (!system_trace_.empty()) result += ",\"systemTraceEvents\": " + system_trace_; diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h index c494a21..3f80b7a 100644 --- a/content/browser/tracing/tracing_controller_impl.h +++ b/content/browser/tracing/tracing_controller_impl.h @@ -28,31 +28,31 @@ class TracingControllerImpl : public TracingController { // TracingController implementation. virtual bool GetCategories( - const GetCategoriesDoneCallback& callback) OVERRIDE; + const GetCategoriesDoneCallback& callback) override; virtual bool EnableRecording( const base::debug::CategoryFilter& category_filter, const base::debug::TraceOptions& trace_options, - const EnableRecordingDoneCallback& callback) OVERRIDE; + const EnableRecordingDoneCallback& callback) override; virtual bool DisableRecording( - const scoped_refptr<TraceDataSink>& sink) OVERRIDE; + const scoped_refptr<TraceDataSink>& sink) override; virtual bool EnableMonitoring( const base::debug::CategoryFilter& category_filter, const base::debug::TraceOptions& trace_options, - const EnableMonitoringDoneCallback& callback) OVERRIDE; + const EnableMonitoringDoneCallback& callback) override; virtual bool DisableMonitoring( - const DisableMonitoringDoneCallback& callback) OVERRIDE; + const DisableMonitoringDoneCallback& callback) override; virtual void GetMonitoringStatus( bool* out_enabled, base::debug::CategoryFilter* out_category_filter, - base::debug::TraceOptions* out_trace_options) OVERRIDE; + base::debug::TraceOptions* out_trace_options) override; virtual bool CaptureMonitoringSnapshot( - const scoped_refptr<TraceDataSink>& sink) OVERRIDE; + const scoped_refptr<TraceDataSink>& sink) override; virtual bool GetTraceBufferPercentFull( - const GetTraceBufferPercentFullCallback& callback) OVERRIDE; + const GetTraceBufferPercentFullCallback& callback) override; virtual bool SetWatchEvent(const std::string& category_name, const std::string& event_name, - const WatchEventCallback& callback) OVERRIDE; - virtual bool CancelWatchEvent() OVERRIDE; + const WatchEventCallback& callback) override; + virtual bool CancelWatchEvent() override; void RegisterTracingUI(TracingUI* tracing_ui); void UnregisterTracingUI(TracingUI* tracing_ui); diff --git a/content/browser/transition_browsertest.cc b/content/browser/transition_browsertest.cc index 48b5407..2452dd6 100644 --- a/content/browser/transition_browsertest.cc +++ b/content/browser/transition_browsertest.cc @@ -26,7 +26,7 @@ class TransitionBrowserTest : public ContentBrowserTest { public: TransitionBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch( switches::kEnableExperimentalWebPlatformFeatures); } @@ -51,7 +51,7 @@ class TransitionBrowserTestObserver ResourceContext* resource_context, AppCacheService* appcache_service, ResourceType resource_type, - ScopedVector<ResourceThrottle>* throttles) OVERRIDE { + ScopedVector<ResourceThrottle>* throttles) override { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ShellResourceDispatcherHostDelegate::RequestBeginning(request, resource_context, @@ -73,7 +73,7 @@ class TransitionBrowserTestObserver net::URLRequest* request, ResourceContext* resource_context, ResourceResponse* response, - IPC::Sender* sender) OVERRIDE { + IPC::Sender* sender) override { ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request_); diff --git a/content/browser/udev_linux.h b/content/browser/udev_linux.h index 2b89094..e62d439 100644 --- a/content/browser/udev_linux.h +++ b/content/browser/udev_linux.h @@ -78,8 +78,8 @@ class UdevLinux : public base::MessagePumpLibevent::Watcher { private: // base::MessagePump:Libevent::Watcher implementation. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; // libudev-related items, the main context, and the monitoring context to be // notified about changes to device states. diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc index 0f1fdf3..36f9097 100644 --- a/content/browser/utility_process_host_impl.cc +++ b/content/browser/utility_process_host_impl.cc @@ -50,22 +50,22 @@ class UtilitySandboxedProcessLauncherDelegate virtual ~UtilitySandboxedProcessLauncherDelegate() {} #if defined(OS_WIN) - virtual bool ShouldLaunchElevated() OVERRIDE { + virtual bool ShouldLaunchElevated() override { return launch_elevated_; } virtual void PreSandbox(bool* disable_default_policy, - base::FilePath* exposed_dir) OVERRIDE { + base::FilePath* exposed_dir) override { *exposed_dir = exposed_dir_; } #elif defined(OS_POSIX) - virtual bool ShouldUseZygote() OVERRIDE { + virtual bool ShouldUseZygote() override { return !no_sandbox_ && exposed_dir_.empty(); } - virtual base::EnvironmentMap GetEnvironment() OVERRIDE { + virtual base::EnvironmentMap GetEnvironment() override { return env_; } - virtual int GetIpcFd() OVERRIDE { + virtual int GetIpcFd() override { return ipc_fd_; } #endif // OS_WIN diff --git a/content/browser/utility_process_host_impl.h b/content/browser/utility_process_host_impl.h index 29f1dba..b88f77d 100644 --- a/content/browser/utility_process_host_impl.h +++ b/content/browser/utility_process_host_impl.h @@ -41,18 +41,18 @@ class CONTENT_EXPORT UtilityProcessHostImpl virtual ~UtilityProcessHostImpl(); // UtilityProcessHost implementation: - virtual bool Send(IPC::Message* message) OVERRIDE; - virtual bool StartBatchMode() OVERRIDE; - virtual void EndBatchMode() OVERRIDE; - virtual void SetExposedDir(const base::FilePath& dir) OVERRIDE; - virtual void EnableMDns() OVERRIDE; - virtual void DisableSandbox() OVERRIDE; + virtual bool Send(IPC::Message* message) override; + virtual bool StartBatchMode() override; + virtual void EndBatchMode() override; + virtual void SetExposedDir(const base::FilePath& dir) override; + virtual void EnableMDns() override; + virtual void DisableSandbox() override; #if defined(OS_WIN) - virtual void ElevatePrivileges() OVERRIDE; + virtual void ElevatePrivileges() override; #endif - virtual const ChildProcessData& GetData() OVERRIDE; + virtual const ChildProcessData& GetData() override; #if defined(OS_POSIX) - virtual void SetEnv(const base::EnvironmentMap& env) OVERRIDE; + virtual void SetEnv(const base::EnvironmentMap& env) override; #endif void set_child_flags(int flags) { child_flags_ = flags; } @@ -63,9 +63,9 @@ class CONTENT_EXPORT UtilityProcessHostImpl bool StartProcess(); // BrowserChildProcessHost: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnProcessLaunchFailed() OVERRIDE; - virtual void OnProcessCrashed(int exit_code) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnProcessLaunchFailed() override; + virtual void OnProcessCrashed(int exit_code) override; // A pointer to our client interface, who will be informed of progress. scoped_refptr<UtilityProcessHostClient> client_; diff --git a/content/browser/vibration/vibration_message_filter.h b/content/browser/vibration/vibration_message_filter.h index 1d603ee..ecb6ae8 100644 --- a/content/browser/vibration/vibration_message_filter.h +++ b/content/browser/vibration/vibration_message_filter.h @@ -19,7 +19,7 @@ class VibrationMessageFilter : public BrowserMessageFilter { private: virtual ~VibrationMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnVibrate(int64 milliseconds); void OnCancelVibration(); diff --git a/content/browser/vibration/vibration_provider_android.h b/content/browser/vibration/vibration_provider_android.h index 4d39c74..e0bd1c1 100644 --- a/content/browser/vibration/vibration_provider_android.h +++ b/content/browser/vibration/vibration_provider_android.h @@ -19,8 +19,8 @@ class VibrationProviderAndroid : public VibrationProvider { private: virtual ~VibrationProviderAndroid(); - virtual void Vibrate(int64 milliseconds) OVERRIDE; - virtual void CancelVibration() OVERRIDE; + virtual void Vibrate(int64 milliseconds) override; + virtual void CancelVibration() override; base::android::ScopedJavaGlobalRef<jobject> j_vibration_provider_; }; diff --git a/content/browser/webui/content_web_ui_controller_factory.h b/content/browser/webui/content_web_ui_controller_factory.h index cee0ec7..2d5ee35 100644 --- a/content/browser/webui/content_web_ui_controller_factory.h +++ b/content/browser/webui/content_web_ui_controller_factory.h @@ -15,14 +15,14 @@ namespace content { class ContentWebUIControllerFactory : public WebUIControllerFactory { public: virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual WebUIController* CreateWebUIControllerForURL( WebUI* web_ui, - const GURL& url) const OVERRIDE; + const GURL& url) const override; static ContentWebUIControllerFactory* GetInstance(); diff --git a/content/browser/webui/generic_handler.h b/content/browser/webui/generic_handler.h index 431373d..99084a3 100644 --- a/content/browser/webui/generic_handler.h +++ b/content/browser/webui/generic_handler.h @@ -21,7 +21,7 @@ class GenericHandler : public WebUIMessageHandler { virtual ~GenericHandler(); // WebUIMessageHandler implementation. - virtual void RegisterMessages() OVERRIDE; + virtual void RegisterMessages() override; private: void HandleNavigateToUrl(const base::ListValue* args); diff --git a/content/browser/webui/shared_resources_data_source.h b/content/browser/webui/shared_resources_data_source.h index 9c3a3c4..d16293e 100644 --- a/content/browser/webui/shared_resources_data_source.h +++ b/content/browser/webui/shared_resources_data_source.h @@ -15,13 +15,13 @@ class SharedResourcesDataSource : public content::URLDataSource { SharedResourcesDataSource(); // content::URLDataSource implementation. - virtual std::string GetSource() const OVERRIDE; + virtual std::string GetSource() const override; virtual void StartDataRequest( const std::string& path, int render_process_id, int render_frame_id, - const content::URLDataSource::GotDataCallback& callback) OVERRIDE; - virtual std::string GetMimeType(const std::string&) const OVERRIDE; + const content::URLDataSource::GotDataCallback& callback) override; + virtual std::string GetMimeType(const std::string&) const override; private: virtual ~SharedResourcesDataSource(); diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index cda08bb..182e9e7 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -106,14 +106,14 @@ class URLRequestChromeJob : public net::URLRequestJob, bool is_incognito); // net::URLRequestJob implementation. - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual void Start() override; + virtual void Kill() override; virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE; + int* bytes_read) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual int GetResponseCode() const override; + virtual void GetResponseInfo(net::HttpResponseInfo* info) override; // Used to notify that the requested data's |mime_type| is ready. void MimeTypeAvailable(const std::string& mime_type); @@ -436,7 +436,7 @@ class ChromeProtocolHandler virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { DCHECK(request); // Check for chrome://view-http-cache/*, which uses its own job type. @@ -477,7 +477,7 @@ class ChromeProtocolHandler GetURLDataManagerForResourceContext(resource_context_), is_incognito_); } - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE { + virtual bool IsSafeRedirectTarget(const GURL& location) const override { return false; } @@ -697,7 +697,7 @@ class DevToolsJobFactory virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE; + net::NetworkDelegate* network_delegate) const override; private: // |resource_context_| and |network_delegate_| are owned by ProfileIOData, diff --git a/content/browser/webui/web_ui_controller_factory_registry.h b/content/browser/webui/web_ui_controller_factory_registry.h index 6d0da82..b435745 100644 --- a/content/browser/webui/web_ui_controller_factory_registry.h +++ b/content/browser/webui/web_ui_controller_factory_registry.h @@ -20,13 +20,13 @@ class CONTENT_EXPORT WebUIControllerFactoryRegistry // WebUIControllerFactory implementation. Each method loops through the same // method on all the factories. virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const OVERRIDE; + WebUI* web_ui, const GURL& url) const override; virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE; + const GURL& url) const override; // Returns true if the given URL can be loaded by Web UI system. This allows // URLs that UseWebUIForURL returns true for, and also URLs that can be loaded diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index fd75bf3..fcf5fdf 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -63,40 +63,40 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource { } // URLDataSource implementation. - virtual std::string GetSource() const OVERRIDE { + virtual std::string GetSource() const override { return parent_->GetSource(); } - virtual std::string GetMimeType(const std::string& path) const OVERRIDE { + virtual std::string GetMimeType(const std::string& path) const override { return parent_->GetMimeType(path); } virtual void StartDataRequest( const std::string& path, int render_process_id, int render_frame_id, - const URLDataSource::GotDataCallback& callback) OVERRIDE { + const URLDataSource::GotDataCallback& callback) override { return parent_->StartDataRequest(path, render_process_id, render_frame_id, callback); } - virtual bool ShouldReplaceExistingSource() const OVERRIDE { + virtual bool ShouldReplaceExistingSource() const override { return parent_->replace_existing_source_; } - virtual bool AllowCaching() const OVERRIDE { + virtual bool AllowCaching() const override { return false; } - virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE { + virtual bool ShouldAddContentSecurityPolicy() const override { return parent_->add_csp_; } - virtual std::string GetContentSecurityPolicyObjectSrc() const OVERRIDE { + virtual std::string GetContentSecurityPolicyObjectSrc() const override { if (parent_->object_src_set_) return parent_->object_src_; return URLDataSource::GetContentSecurityPolicyObjectSrc(); } - virtual std::string GetContentSecurityPolicyFrameSrc() const OVERRIDE { + virtual std::string GetContentSecurityPolicyFrameSrc() const override { if (parent_->frame_src_set_) return parent_->frame_src_; return URLDataSource::GetContentSecurityPolicyFrameSrc(); } - virtual bool ShouldDenyXFrameOptions() const OVERRIDE { + virtual bool ShouldDenyXFrameOptions() const override { return parent_->deny_xframe_options_; } diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h index 7a07eee..8518fd4 100644 --- a/content/browser/webui/web_ui_data_source_impl.h +++ b/content/browser/webui/web_ui_data_source_impl.h @@ -28,26 +28,26 @@ class CONTENT_EXPORT WebUIDataSourceImpl public: // WebUIDataSource implementation: virtual void AddString(const std::string& name, - const base::string16& value) OVERRIDE; + const base::string16& value) override; virtual void AddString(const std::string& name, - const std::string& value) OVERRIDE; - virtual void AddLocalizedString(const std::string& name, int ids) OVERRIDE; + const std::string& value) override; + virtual void AddLocalizedString(const std::string& name, int ids) override; virtual void AddLocalizedStrings( - const base::DictionaryValue& localized_strings) OVERRIDE; - virtual void AddBoolean(const std::string& name, bool value) OVERRIDE; - virtual void SetJsonPath(const std::string& path) OVERRIDE; + const base::DictionaryValue& localized_strings) override; + virtual void AddBoolean(const std::string& name, bool value) override; + virtual void SetJsonPath(const std::string& path) override; virtual void AddResourcePath(const std::string &path, - int resource_id) OVERRIDE; - virtual void SetDefaultResource(int resource_id) OVERRIDE; + int resource_id) override; + virtual void SetDefaultResource(int resource_id) override; virtual void SetRequestFilter( - const WebUIDataSource::HandleRequestCallback& callback) OVERRIDE; - virtual void DisableReplaceExistingSource() OVERRIDE; - virtual void DisableContentSecurityPolicy() OVERRIDE; + const WebUIDataSource::HandleRequestCallback& callback) override; + virtual void DisableReplaceExistingSource() override; + virtual void DisableContentSecurityPolicy() override; virtual void OverrideContentSecurityPolicyObjectSrc( - const std::string& data) OVERRIDE; + const std::string& data) override; virtual void OverrideContentSecurityPolicyFrameSrc( - const std::string& data) OVERRIDE; - virtual void DisableDenyXFrameOptions() OVERRIDE; + const std::string& data) override; + virtual void DisableDenyXFrameOptions() override; protected: virtual ~WebUIDataSourceImpl(); diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc index 02ab4152..07e271f 100644 --- a/content/browser/webui/web_ui_data_source_unittest.cc +++ b/content/browser/webui/web_ui_data_source_unittest.cc @@ -26,7 +26,7 @@ class TestClient : public TestContentClient { TestClient() {} virtual ~TestClient() {} - virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE { + virtual base::string16 GetLocalizedString(int message_id) const override { if (message_id == kDummyStringId) return base::UTF8ToUTF16(kDummyString); return base::string16(); @@ -34,7 +34,7 @@ class TestClient : public TestContentClient { } virtual base::RefCountedStaticMemory* GetDataResourceBytes( - int resource_id) const OVERRIDE { + int resource_id) const override { base::RefCountedStaticMemory* bytes = NULL; if (resource_id == kDummyDefaultResourceId) { bytes = new base::RefCountedStaticMemory( diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h index 8dad9d97..b399fce 100644 --- a/content/browser/webui/web_ui_impl.h +++ b/content/browser/webui/web_ui_impl.h @@ -31,47 +31,47 @@ class CONTENT_EXPORT WebUIImpl : public WebUI, void RenderViewCreated(RenderViewHost* render_view_host); // WebUI implementation: - virtual WebContents* GetWebContents() const OVERRIDE; - virtual WebUIController* GetController() const OVERRIDE; - virtual void SetController(WebUIController* controller) OVERRIDE; - virtual float GetDeviceScaleFactor() const OVERRIDE; - virtual const base::string16& GetOverriddenTitle() const OVERRIDE; - virtual void OverrideTitle(const base::string16& title) OVERRIDE; - virtual ui::PageTransition GetLinkTransitionType() const OVERRIDE; - virtual void SetLinkTransitionType(ui::PageTransition type) OVERRIDE; - virtual int GetBindings() const OVERRIDE; - virtual void SetBindings(int bindings) OVERRIDE; - virtual void OverrideJavaScriptFrame(const std::string& frame_name) OVERRIDE; - virtual void AddMessageHandler(WebUIMessageHandler* handler) OVERRIDE; + virtual WebContents* GetWebContents() const override; + virtual WebUIController* GetController() const override; + virtual void SetController(WebUIController* controller) override; + virtual float GetDeviceScaleFactor() const override; + virtual const base::string16& GetOverriddenTitle() const override; + virtual void OverrideTitle(const base::string16& title) override; + virtual ui::PageTransition GetLinkTransitionType() const override; + virtual void SetLinkTransitionType(ui::PageTransition type) override; + virtual int GetBindings() const override; + virtual void SetBindings(int bindings) override; + virtual void OverrideJavaScriptFrame(const std::string& frame_name) override; + virtual void AddMessageHandler(WebUIMessageHandler* handler) override; typedef base::Callback<void(const base::ListValue*)> MessageCallback; virtual void RegisterMessageCallback( const std::string& message, - const MessageCallback& callback) OVERRIDE; + const MessageCallback& callback) override; virtual void ProcessWebUIMessage(const GURL& source_url, const std::string& message, - const base::ListValue& args) OVERRIDE; + const base::ListValue& args) override; virtual void CallJavascriptFunction( - const std::string& function_name) OVERRIDE; + const std::string& function_name) override; virtual void CallJavascriptFunction(const std::string& function_name, - const base::Value& arg) OVERRIDE; + const base::Value& arg) override; virtual void CallJavascriptFunction(const std::string& function_name, const base::Value& arg1, - const base::Value& arg2) OVERRIDE; + const base::Value& arg2) override; virtual void CallJavascriptFunction(const std::string& function_name, const base::Value& arg1, const base::Value& arg2, - const base::Value& arg3) OVERRIDE; + const base::Value& arg3) override; virtual void CallJavascriptFunction(const std::string& function_name, const base::Value& arg1, const base::Value& arg2, const base::Value& arg3, - const base::Value& arg4) OVERRIDE; + const base::Value& arg4) override; virtual void CallJavascriptFunction( const std::string& function_name, - const std::vector<const base::Value*>& args) OVERRIDE; + const std::vector<const base::Value*>& args) override; // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: // IPC message handling. diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index ff9a4e1..c4908ef 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -67,7 +67,7 @@ class BrowserTargetImpl : public mojo::InterfaceImpl<BrowserTarget> { virtual ~BrowserTargetImpl() {} // mojo::InterfaceImpl<BrowserTarget> overrides: - virtual void PingResponse() OVERRIDE { + virtual void PingResponse() override { NOTREACHED(); } @@ -86,12 +86,12 @@ class PingBrowserTargetImpl : public BrowserTargetImpl { virtual ~PingBrowserTargetImpl() {} // mojo::InterfaceImpl<BrowserTarget> overrides: - virtual void OnConnectionEstablished() OVERRIDE { + virtual void OnConnectionEstablished() override { client()->Ping(); } // Quit the RunLoop when called. - virtual void PingResponse() OVERRIDE { + virtual void PingResponse() override { got_message = true; run_loop_->Quit(); } @@ -130,7 +130,7 @@ class PingTestWebUIController : public TestWebUIController { virtual ~PingTestWebUIController() {} // WebUIController overrides: - virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE { + virtual void RenderViewCreated(RenderViewHost* render_view_host) override { render_view_host->GetMainFrame()->GetServiceRegistry()-> AddService<BrowserTarget>(base::Bind( &PingTestWebUIController::CreateHandler, base::Unretained(this))); @@ -153,21 +153,21 @@ class TestWebUIControllerFactory : public WebUIControllerFactory { void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; } virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const OVERRIDE { + WebUI* web_ui, const GURL& url) const override { if (url.query() == "ping") return new PingTestWebUIController(web_ui, run_loop_); return NULL; } virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return reinterpret_cast<WebUI::TypeID>(1); } virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return true; } virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return true; } diff --git a/content/browser/zygote_host/zygote_host_impl_linux.h b/content/browser/zygote_host/zygote_host_impl_linux.h index 20db604..0e746ef 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.h +++ b/content/browser/zygote_host/zygote_host_impl_linux.h @@ -54,10 +54,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHost { int* exit_code); // ZygoteHost implementation: - virtual pid_t GetPid() const OVERRIDE; - virtual int GetSandboxStatus() const OVERRIDE; + virtual pid_t GetPid() const override; + virtual int GetSandboxStatus() const override; virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle, - int score) OVERRIDE; + int score) override; private: friend struct DefaultSingletonTraits<ZygoteHostImpl>; diff --git a/content/common/gpu/image_transport_surface_mac.mm b/content/common/gpu/image_transport_surface_mac.mm index 0b80799..76a8517 100644 --- a/content/common/gpu/image_transport_surface_mac.mm +++ b/content/common/gpu/image_transport_surface_mac.mm @@ -22,7 +22,7 @@ class DRTSurfaceOSMesa : public gfx::GLSurfaceOSMesa { : GLSurfaceOSMesa(gfx::OSMesaSurfaceFormatRGBA, gfx::Size(1, 1)) {} // Implement a subset of GLSurface. - virtual bool SwapBuffers() OVERRIDE; + virtual bool SwapBuffers() override; private: virtual ~DRTSurfaceOSMesa() {} diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm index 6379c8b..d16437c 100644 --- a/content/common/sandbox_mac_fontloading_unittest.mm +++ b/content/common/sandbox_mac_fontloading_unittest.mm @@ -20,8 +20,8 @@ namespace content { class FontLoadingTestCase : public MacSandboxTestCase { public: FontLoadingTestCase() : font_data_length_(-1) {} - virtual bool BeforeSandboxInit() OVERRIDE; - virtual bool SandboxedTest() OVERRIDE; + virtual bool BeforeSandboxInit() override; + virtual bool SandboxedTest() override; private: scoped_ptr<base::SharedMemory> font_shmem_; size_t font_data_length_; diff --git a/content/common/sandbox_mac_system_access_unittest.mm b/content/common/sandbox_mac_system_access_unittest.mm index 865e10b..65fc368 100644 --- a/content/common/sandbox_mac_system_access_unittest.mm +++ b/content/common/sandbox_mac_system_access_unittest.mm @@ -28,9 +28,9 @@ class MacSandboxedClipboardTestCase : public MacSandboxTestCase { MacSandboxedClipboardTestCase(); virtual ~MacSandboxedClipboardTestCase(); - virtual bool SandboxedTest() OVERRIDE; + virtual bool SandboxedTest() override; - virtual void SetTestData(const char* test_data) OVERRIDE; + virtual void SetTestData(const char* test_data) override; private: NSString* clipboard_name_; }; @@ -87,7 +87,7 @@ TEST_F(MacSandboxTest, ClipboardAccess) { // Test case for checking sandboxing of filesystem apis. class MacSandboxedFileAccessTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest() OVERRIDE; + virtual bool SandboxedTest() override; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedFileAccessTestCase); @@ -105,7 +105,7 @@ TEST_F(MacSandboxTest, FileAccess) { // /dev/urandom is available to any sandboxed process. class MacSandboxedUrandomTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest() OVERRIDE; + virtual bool SandboxedTest() override; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedUrandomTestCase); @@ -132,7 +132,7 @@ TEST_F(MacSandboxTest, UrandomAccess) { // Test case for checking sandboxing of OpenSSL initialization. class MacSandboxedOpenSSLTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest() OVERRIDE; + virtual bool SandboxedTest() override; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedOpenSSLTestCase); @@ -155,7 +155,7 @@ TEST_F(MacSandboxTest, OpenSSLAccess) { // Test case for checking sandboxing of NSS initialization. class MacSandboxedNSSTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest() OVERRIDE; + virtual bool SandboxedTest() override; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedNSSTestCase); diff --git a/content/public/browser/screen_orientation_provider.h b/content/public/browser/screen_orientation_provider.h index 18260c7..2a30638 100644 --- a/content/public/browser/screen_orientation_provider.h +++ b/content/public/browser/screen_orientation_provider.h @@ -41,7 +41,7 @@ class CONTENT_EXPORT ScreenOrientationProvider : public WebContentsObserver { static void SetDelegate(ScreenOrientationDelegate* delegate_); // WebContentsObserver - virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE; + virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override; private: struct LockInformation { diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index 1017c75..2ec331b 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc @@ -107,10 +107,10 @@ class InterstitialObserver : public content::WebContentsObserver { virtual ~InterstitialObserver() {} // WebContentsObserver methods: - virtual void DidAttachInterstitialPage() OVERRIDE { + virtual void DidAttachInterstitialPage() override { attach_callback_.Run(); } - virtual void DidDetachInterstitialPage() OVERRIDE { + virtual void DidDetachInterstitialPage() override { detach_callback_.Run(); } diff --git a/content/shell/app/shell_crash_reporter_client.h b/content/shell/app/shell_crash_reporter_client.h index 3be19a7..c68f63f 100644 --- a/content/shell/app/shell_crash_reporter_client.h +++ b/content/shell/app/shell_crash_reporter_client.h @@ -22,29 +22,29 @@ class ShellCrashReporterClient : public crash_reporter::CrashReporterClient { base::string16* product_name, base::string16* version, base::string16* special_build, - base::string16* channel_name) OVERRIDE; + base::string16* channel_name) override; #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS) // Returns a textual description of the product type and version to include // in the crash report. virtual void GetProductNameAndVersion(const char** product_name, - const char** version) OVERRIDE; + const char** version) override; - virtual base::FilePath GetReporterLogFilename() OVERRIDE; + virtual base::FilePath GetReporterLogFilename() override; #endif // The location where minidump files should be written. Returns true if // |crash_dir| was set. - virtual bool GetCrashDumpLocation(base::FilePath* crash_dir) OVERRIDE; + virtual bool GetCrashDumpLocation(base::FilePath* crash_dir) override; #if defined(OS_ANDROID) // Returns the descriptor key of the android minidump global descriptor. - virtual int GetAndroidMinidumpDescriptor() OVERRIDE; + virtual int GetAndroidMinidumpDescriptor() override; #endif virtual bool EnableBreakpadForProcess( - const std::string& process_type) OVERRIDE; + const std::string& process_type) override; private: DISALLOW_COPY_AND_ASSIGN(ShellCrashReporterClient); diff --git a/content/shell/app/shell_main_delegate.h b/content/shell/app/shell_main_delegate.h index 2d69d08..7205ce2 100644 --- a/content/shell/app/shell_main_delegate.h +++ b/content/shell/app/shell_main_delegate.h @@ -24,16 +24,16 @@ class ShellMainDelegate : public ContentMainDelegate { virtual ~ShellMainDelegate(); // ContentMainDelegate implementation: - virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; - virtual void PreSandboxStartup() OVERRIDE; + virtual bool BasicStartupComplete(int* exit_code) override; + virtual void PreSandboxStartup() override; virtual int RunProcess( const std::string& process_type, - const MainFunctionParams& main_function_params) OVERRIDE; + const MainFunctionParams& main_function_params) override; #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) - virtual void ZygoteForked() OVERRIDE; + virtual void ZygoteForked() override; #endif - virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; - virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE; + virtual ContentBrowserClient* CreateContentBrowserClient() override; + virtual ContentRendererClient* CreateContentRendererClient() override; static void InitializeResourceBundle(); |