diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 02:08:01 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 02:08:01 +0000 |
commit | c3e3589c3e2dd1bc2e80d708fd49414376b2da8e (patch) | |
tree | b024190741fb05211f5d8f600bb93c0237b0eed3 /content | |
parent | 3b22093c5ea7fd343be8d40f6e229ca7e4eaef8c (diff) | |
download | chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.zip chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.gz chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, content/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12210030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
106 files changed, 285 insertions, 255 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 047a8bb..ce1f5c9 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -479,7 +479,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { #endif } - ~ContentMainRunnerImpl() { + virtual ~ContentMainRunnerImpl() { if (is_initialized_ && !is_shutdown_) Shutdown(); } diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc index 1617bdd..4ddf741 100644 --- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc @@ -45,7 +45,7 @@ class CountedBrowserAccessibilityFactory : public BrowserAccessibilityFactory { public: virtual ~CountedBrowserAccessibilityFactory() {} - virtual BrowserAccessibility* Create() { + virtual BrowserAccessibility* Create() OVERRIDE { return new CountedBrowserAccessibility(); } }; diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index 881074e..c283db9 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -36,7 +36,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { created_threads_(false) { } - ~BrowserMainRunnerImpl() { + virtual ~BrowserMainRunnerImpl() { if (is_initialized_ && !is_shutdown_) Shutdown(); } diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index 7f0d75d..2a6a381 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -31,7 +31,7 @@ class ChildProcessSecurityPolicyTestBrowserClient public: ChildProcessSecurityPolicyTestBrowserClient() {} - virtual bool IsHandledURL(const GURL& url) { + virtual bool IsHandledURL(const GURL& url) OVERRIDE { return schemes_.find(url.scheme()) != schemes_.end(); } diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index d002a10..5bceb69 100644 --- a/content/browser/device_orientation/device_orientation_browsertest.cc +++ b/content/browser/device_orientation/device_orientation_browsertest.cc @@ -26,11 +26,11 @@ class MockProvider : public Provider { removed_observer_(false) { } - virtual void AddObserver(Observer* observer) { + virtual void AddObserver(Observer* observer) OVERRIDE { added_observer_ = true; observer->OnDeviceDataUpdate(device_data_.get(), device_data_type_); } - virtual void RemoveObserver(Observer* observer) { + virtual void RemoveObserver(Observer* observer) OVERRIDE { removed_observer_ = true; } @@ -46,7 +46,7 @@ class MockProvider : public Provider { class DeviceOrientationBrowserTest : public ContentBrowserTest { public: // From ContentBrowserTest. - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableDeviceOrientation)); } }; diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc index 60ce924..4358c7f 100644 --- a/content/browser/device_orientation/provider_unittest.cc +++ b/content/browser/device_orientation/provider_unittest.cc @@ -279,7 +279,8 @@ class MockDeviceDataFactory : device_data_factory_(device_data_factory) { } // From DataFetcher. Called by the Provider. - virtual const DeviceData* GetDeviceData(DeviceData::Type device_data_type) { + virtual const DeviceData* GetDeviceData( + DeviceData::Type device_data_type) OVERRIDE { base::AutoLock auto_lock(device_data_factory_->lock_); if (device_data_factory_->is_failing_) return NULL; diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index c629892..bbe4c46 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -112,10 +112,10 @@ class DevToolsClientHostImpl : public DevToolsClientHost { detach_reason_("target_closed") { } - ~DevToolsClientHostImpl() {} + virtual ~DevToolsClientHostImpl() {} // DevToolsClientHost interface - virtual void InspectedContentsClosing() { + virtual void InspectedContentsClosing() OVERRIDE { if (is_closed_) return; is_closed_ = true; @@ -135,7 +135,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost { base::Bind(&net::HttpServer::Close, server_, connection_id_)); } - virtual void DispatchOnInspectorFrontend(const std::string& data) { + virtual void DispatchOnInspectorFrontend(const std::string& data) OVERRIDE { message_loop_->PostTask( FROM_HERE, base::Bind(&net::HttpServer::SendOverWebSocket, @@ -144,7 +144,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost { data)); } - virtual void ReplacedWithAnotherClient() { + virtual void ReplacedWithAnotherClient() OVERRIDE { detach_reason_ = "replaced_with_devtools"; } diff --git a/content/browser/devtools/devtools_http_handler_unittest.cc b/content/browser/devtools/devtools_http_handler_unittest.cc index 0396ff8..a06c61d 100644 --- a/content/browser/devtools/devtools_http_handler_unittest.cc +++ b/content/browser/devtools/devtools_http_handler_unittest.cc @@ -61,9 +61,13 @@ class DummyDelegate : public DevToolsHttpHandlerDelegate { virtual base::FilePath GetDebugFrontendDir() OVERRIDE { return base::FilePath(); } - virtual std::string GetPageThumbnailData(const GURL& url) { return ""; } - virtual RenderViewHost* CreateNewTarget() { return NULL; } - virtual TargetType GetTargetType(RenderViewHost*) { return kTargetTypeTab; } + virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE { + return ""; + } + virtual RenderViewHost* CreateNewTarget() OVERRIDE { return NULL; } + virtual TargetType GetTargetType(RenderViewHost*) OVERRIDE { + return kTargetTypeTab; + } }; } diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index a816af7..d95da47 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -38,15 +38,16 @@ class TestDevToolsClientHost : public DevToolsClientHost { manager->ClientHostClosing(this); closed_ = true; } - virtual void InspectedContentsClosing() { + virtual void InspectedContentsClosing() OVERRIDE { FAIL(); } - virtual void DispatchOnInspectorFrontend(const std::string& message) { + virtual void DispatchOnInspectorFrontend( + const std::string& message) OVERRIDE { last_sent_message = &message; } - virtual void ReplacedWithAnotherClient() { + virtual void ReplacedWithAnotherClient() OVERRIDE { } static void ResetCounters() { @@ -71,7 +72,7 @@ class TestWebContentsDelegate : public WebContentsDelegate { TestWebContentsDelegate() : renderer_unresponsive_received_(false) {} // Notification that the contents is hung. - virtual void RendererUnresponsive(WebContents* source) { + virtual void RendererUnresponsive(WebContents* source) OVERRIDE { renderer_unresponsive_received_ = true; } diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index c76ca65..4b965da 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -85,7 +85,7 @@ class DownloadFileTest : public testing::Test { file_thread_(BrowserThread::FILE, &loop_) { } - ~DownloadFileTest() { + virtual ~DownloadFileTest() { } void SetUpdateDownloadInfo(int64 bytes, int64 bytes_per_sec, diff --git a/content/browser/download/download_id_unittest.cc b/content/browser/download/download_id_unittest.cc index d59d33d..55e6494 100644 --- a/content/browser/download/download_id_unittest.cc +++ b/content/browser/download/download_id_unittest.cc @@ -37,7 +37,7 @@ class DownloadIdTest : public testing::Test { } } - ~DownloadIdTest() { + virtual ~DownloadIdTest() { for (size_t i = 0; i < num_managers_; ++i) download_managers_[i] = NULL; // Releases & deletes. } diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc index 939c517..429f8b1 100644 --- a/content/browser/download/download_item_impl_unittest.cc +++ b/content/browser/download/download_item_impl_unittest.cc @@ -133,13 +133,13 @@ class DownloadItemTest : public testing::Test { if (item_) item_->RemoveObserver(this); } - virtual void OnDownloadRemoved(DownloadItem* download) { + virtual void OnDownloadRemoved(DownloadItem* download) OVERRIDE { DVLOG(20) << " " << __FUNCTION__ << " download = " << download->DebugString(false); removed_ = true; } - virtual void OnDownloadUpdated(DownloadItem* download) { + virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE { DVLOG(20) << " " << __FUNCTION__ << " download = " << download->DebugString(false); updated_ = true; @@ -155,12 +155,12 @@ class DownloadItemTest : public testing::Test { last_state_ = new_state; } - virtual void OnDownloadOpened(DownloadItem* download) { + virtual void OnDownloadOpened(DownloadItem* download) OVERRIDE { DVLOG(20) << " " << __FUNCTION__ << " download = " << download->DebugString(false); } - virtual void OnDownloadDestroyed(DownloadItem* download) { + virtual void OnDownloadDestroyed(DownloadItem* download) OVERRIDE { DVLOG(20) << " " << __FUNCTION__ << " download = " << download->DebugString(false); destroyed_ = true; diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index a923f87..46e43d4 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc @@ -434,7 +434,7 @@ class DownloadManagerTest : public testing::Test { } // We tear down everything in TearDown(). - ~DownloadManagerTest() {} + virtual ~DownloadManagerTest() {} // Create a MockDownloadItemFactory and MockDownloadManagerDelegate, // then create a DownloadManager that points diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index cc8f533..cfa63ed 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc @@ -14,7 +14,7 @@ const char kTestFile[] = "files/simple_page.html"; class SavePackageBrowserTest : public ContentBrowserTest { protected: - void SetUp() OVERRIDE { + virtual void SetUp() OVERRIDE { ASSERT_TRUE(save_dir_.CreateUniqueTempDir()); ContentBrowserTest::SetUp(); } diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 24a8d61..56dd4ec 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -52,7 +52,7 @@ class FileSystemBrowserTest : public ContentBrowserTest { class FileSystemBrowserTestWithLowQuota : public FileSystemBrowserTest { public: - virtual void SetUpOnMainThread() { + virtual void SetUpOnMainThread() OVERRIDE { const int kInitialQuotaKilobytes = 5000; const int kTemporaryStorageQuotaMaxSize = kInitialQuotaKilobytes * 1024 * QuotaManager::kPerHostTemporaryPortion; diff --git a/content/browser/geolocation/device_data_provider_unittest.cc b/content/browser/geolocation/device_data_provider_unittest.cc index f39c7e0..0f0c957 100644 --- a/content/browser/geolocation/device_data_provider_unittest.cc +++ b/content/browser/geolocation/device_data_provider_unittest.cc @@ -14,7 +14,7 @@ class NullWifiDataListenerInterface public: // ListenerInterface virtual void DeviceDataUpdateAvailable( - DeviceDataProvider<WifiData>* provider) {} + DeviceDataProvider<WifiData>* provider) OVERRIDE {} }; TEST(GeolocationDeviceDataProviderWifiData, CreateDestroy) { diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc index c5591cd..1096ed9 100644 --- a/content/browser/geolocation/geolocation_dispatcher_host.cc +++ b/content/browser/geolocation/geolocation_dispatcher_host.cc @@ -51,10 +51,11 @@ class GeolocationDispatcherHostImpl : public GeolocationDispatcherHost, GeolocationPermissionContext* geolocation_permission_context); // GeolocationDispatcherHost - virtual bool OnMessageReceived(const IPC::Message& msg, bool* msg_was_ok); + virtual bool OnMessageReceived(const IPC::Message& msg, + bool* msg_was_ok) OVERRIDE; // GeolocationObserver - virtual void OnLocationUpdate(const Geoposition& position); + virtual void OnLocationUpdate(const Geoposition& position) OVERRIDE; private: virtual ~GeolocationDispatcherHostImpl(); diff --git a/content/browser/geolocation/geolocation_provider_unittest.cc b/content/browser/geolocation/geolocation_provider_unittest.cc index b4b4fd9..dcffef0 100644 --- a/content/browser/geolocation/geolocation_provider_unittest.cc +++ b/content/browser/geolocation/geolocation_provider_unittest.cc @@ -53,7 +53,7 @@ GeolocationArbitrator* LocationProviderForTestArbitrator::CreateArbitrator() { class NullGeolocationObserver : public GeolocationObserver { public: // GeolocationObserver - virtual void OnLocationUpdate(const Geoposition& position) {} + virtual void OnLocationUpdate(const Geoposition& position) OVERRIDE {} }; class MockGeolocationObserver : public GeolocationObserver { @@ -65,7 +65,7 @@ class MockGeolocationObserver : public GeolocationObserver { class AsyncMockGeolocationObserver : public MockGeolocationObserver { public: // GeolocationObserver - virtual void OnLocationUpdate(const Geoposition& position) { + virtual void OnLocationUpdate(const Geoposition& position) OVERRIDE { MockGeolocationObserver::OnLocationUpdate(position); MessageLoop::current()->Quit(); } @@ -122,7 +122,7 @@ class GeolocationProviderTest : public testing::Test { provider_(new LocationProviderForTestArbitrator) { } - ~GeolocationProviderTest() {} + virtual ~GeolocationProviderTest() {} LocationProviderForTestArbitrator* provider() { return provider_.get(); } diff --git a/content/browser/geolocation/gps_location_provider_unittest_linux.cc b/content/browser/geolocation/gps_location_provider_unittest_linux.cc index a3cd198..6aaff15 100644 --- a/content/browser/geolocation/gps_location_provider_unittest_linux.cc +++ b/content/browser/geolocation/gps_location_provider_unittest_linux.cc @@ -13,9 +13,9 @@ namespace content { class MockLibGps : public LibGps { public: MockLibGps(); - ~MockLibGps(); + virtual ~MockLibGps(); - virtual bool GetPositionIfFixed(Geoposition* position) { + virtual bool GetPositionIfFixed(Geoposition* position) OVERRIDE { CHECK(position); ++get_position_calls_; *position = get_position_; @@ -51,7 +51,8 @@ class MockLibGps : public LibGps { class LocaionProviderListenerLoopQuitter : public LocationProviderBase::ListenerInterface { // LocationProviderBase::ListenerInterface - virtual void LocationUpdateAvailable(LocationProviderBase* provider) { + virtual void LocationUpdateAvailable( + LocationProviderBase* provider) OVERRIDE { MessageLoop::current()->Quit(); } }; @@ -59,7 +60,7 @@ class LocaionProviderListenerLoopQuitter class GeolocationGpsProviderLinuxTests : public testing::Test { public: GeolocationGpsProviderLinuxTests(); - ~GeolocationGpsProviderLinuxTests(); + virtual ~GeolocationGpsProviderLinuxTests(); static LibGps* NewMockLibGps() { return new MockLibGps(); diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc index b385f86..e2b39ee 100644 --- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc +++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc @@ -24,7 +24,7 @@ class MockLocationObserver : public GeolocationObserver { ASSERT_FALSE(last_position_.Validate()); } // Delegate - virtual void OnLocationUpdate(const Geoposition& position) { + virtual void OnLocationUpdate(const Geoposition& position) OVERRIDE { last_position_ = position; } diff --git a/content/browser/geolocation/mock_location_provider.cc b/content/browser/geolocation/mock_location_provider.cc index 293a558..e146f38 100644 --- a/content/browser/geolocation/mock_location_provider.cc +++ b/content/browser/geolocation/mock_location_provider.cc @@ -86,7 +86,7 @@ class AutoMockLocationProvider : public MockLocationProvider { position_.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE; } } - virtual bool StartProvider(bool high_accuracy) { + virtual bool StartProvider(bool high_accuracy) OVERRIDE { MockLocationProvider::StartProvider(high_accuracy); if (!requires_permission_to_start_) { UpdateListenersIfNeeded(); @@ -94,7 +94,7 @@ class AutoMockLocationProvider : public MockLocationProvider { return true; } - void OnPermissionGranted() { + virtual void OnPermissionGranted() OVERRIDE { MockLocationProvider::OnPermissionGranted(); if (requires_permission_to_start_) { UpdateListenersIfNeeded(); diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index f46f2ee..fb01795 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -37,7 +37,8 @@ class MessageLoopQuitListener CHECK(client_message_loop_); } // ListenerInterface - virtual void LocationUpdateAvailable(LocationProviderBase* provider) { + virtual void LocationUpdateAvailable( + LocationProviderBase* provider) OVERRIDE { EXPECT_EQ(client_message_loop_, MessageLoop::current()); updated_provider_ = provider; client_message_loop_->Quit(); diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc index ccc13cb..84b1d15 100644 --- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc @@ -67,7 +67,7 @@ class MessageLoopQuitListener } // ListenerInterface virtual void DeviceDataUpdateAvailable( - DeviceDataProvider<WifiData>* provider) { + DeviceDataProvider<WifiData>* provider) OVERRIDE { // Provider should call back on client's thread. EXPECT_EQ(MessageLoop::current(), message_loop_to_quit_); provider_ = provider; @@ -85,11 +85,11 @@ class WifiDataProviderCommonWithMock : public WifiDataProviderCommon { new_polling_policy_(new MockPollingPolicy) {} // WifiDataProviderCommon - virtual WlanApiInterface* NewWlanApi() { + virtual WlanApiInterface* NewWlanApi() OVERRIDE { CHECK(new_wlan_api_ != NULL); return new_wlan_api_.release(); } - virtual PollingPolicyInterface* NewPollingPolicy() { + virtual PollingPolicyInterface* NewPollingPolicy() OVERRIDE { CHECK(new_polling_policy_ != NULL); return new_polling_policy_.release(); } diff --git a/content/browser/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc index fc4a30f..709063a 100644 --- a/content/browser/geolocation/wifi_data_provider_linux.cc +++ b/content/browser/geolocation/wifi_data_provider_linux.cc @@ -39,7 +39,7 @@ enum { NM_DEVICE_TYPE_WIFI = 2 }; class NetworkManagerWlanApi : public WifiDataProviderCommon::WlanApiInterface { public: NetworkManagerWlanApi(); - ~NetworkManagerWlanApi(); + virtual ~NetworkManagerWlanApi(); // Must be called before any other interface method. Will return false if the // NetworkManager session cannot be created (e.g. not present on this distro), @@ -53,7 +53,7 @@ class NetworkManagerWlanApi : public WifiDataProviderCommon::WlanApiInterface { // // This function makes blocking D-Bus calls, but it's totally fine as // the code runs in "Geolocation" thread, not the browser's UI thread. - virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE; private: // Enumerates the list of available network adapter devices known to diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc index fadc97a..4585008 100644 --- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc @@ -24,7 +24,7 @@ using ::testing::Unused; namespace content { class GeolocationWifiDataProviderLinuxTest : public testing::Test { - void SetUp() { + virtual void SetUp() { // Create a mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; diff --git a/content/browser/gpu/gpu_blacklist_unittest.cc b/content/browser/gpu/gpu_blacklist_unittest.cc index 374b23b..08a6cf2 100644 --- a/content/browser/gpu/gpu_blacklist_unittest.cc +++ b/content/browser/gpu/gpu_blacklist_unittest.cc @@ -37,7 +37,7 @@ class GpuBlacklistTest : public testing::Test { } protected: - void SetUp() { + virtual void SetUp() { gpu_info_.gpu.vendor_id = kNvidiaVendorId; gpu_info_.gpu.device_id = 0x0640; gpu_info_.driver_vendor = "NVIDIA"; @@ -51,7 +51,7 @@ class GpuBlacklistTest : public testing::Test { gpu_info_.performance_stats.overall = 5.0; } - void TearDown() { + virtual void TearDown() { } private: diff --git a/content/browser/gpu/gpu_crash_browsertest.cc b/content/browser/gpu/gpu_crash_browsertest.cc index 90b1fb3..df167e0 100644 --- a/content/browser/gpu/gpu_crash_browsertest.cc +++ b/content/browser/gpu/gpu_crash_browsertest.cc @@ -17,7 +17,7 @@ namespace content { class GpuCrashTest : public ContentBrowserTest { protected: - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath test_dir; ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir)); gpu_test_dir_ = test_dir.AppendASCII("gpu"); diff --git a/content/browser/gpu/gpu_data_manager_impl_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_unittest.cc index 678f43c..09b9cd6 100644 --- a/content/browser/gpu/gpu_data_manager_impl_unittest.cc +++ b/content/browser/gpu/gpu_data_manager_impl_unittest.cc @@ -81,10 +81,10 @@ class GpuDataManagerImplTest : public testing::Test { DISALLOW_COPY_AND_ASSIGN(ScopedGpuDataManagerImpl); }; - void SetUp() { + virtual void SetUp() { } - void TearDown() { + virtual void TearDown() { } base::Time JustBeforeExpiration(GpuDataManagerImpl* manager); diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc index 00f7331..4a8beb5 100644 --- a/content/browser/gpu/gpu_memory_test.cc +++ b/content/browser/gpu/gpu_memory_test.cc @@ -73,13 +73,13 @@ class GpuMemoryTest : public content::ContentBrowserTest { virtual ~GpuMemoryTest() { } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath test_dir; ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); gpu_test_dir_ = test_dir.AppendASCII("gpu"); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kEnableLogging); command_line->AppendSwitch(switches::kForceCompositingMode); command_line->AppendSwitchASCII(switches::kForceGpuMemAvailableMb, diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc index 734d07e..ef5c33d 100644 --- a/content/browser/gpu/webgl_conformance_test.cc +++ b/content/browser/gpu/webgl_conformance_test.cc @@ -28,12 +28,12 @@ class WebGLConformanceTest : public ContentBrowserTest { WebGLConformanceTest() {} #if !defined(OS_WIN) - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // Allow privileged WebGL extensions. command_line->AppendSwitch(switches::kEnablePrivilegedWebGLExtensions); } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath webgl_conformance_path; PathService::Get(base::DIR_SOURCE_ROOT, &webgl_conformance_path); webgl_conformance_path = webgl_conformance_path.Append( diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 3043551..4a02580 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, Bug109187Test) { class IndexedDBBrowserTestWithLowQuota : public IndexedDBBrowserTest { public: - virtual void SetUpOnMainThread() { + virtual void SetUpOnMainThread() OVERRIDE { const int kInitialQuotaKilobytes = 5000; const int kTemporaryStorageQuotaMaxSize = kInitialQuotaKilobytes * 1024 * QuotaManager::kPerHostTemporaryPortion; @@ -189,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithLowQuota, QuotaTest) { class IndexedDBBrowserTestWithGCExposed : public IndexedDBBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); } }; @@ -223,7 +223,7 @@ class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest { public: IndexedDBBrowserTestWithPreexistingLevelDB() : disk_usage_(-1) { } - virtual void SetUpOnMainThread() { + virtual void SetUpOnMainThread() OVERRIDE { scoped_refptr<IndexedDBContext> context = GetContext(); BrowserThread::PostTask( BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, @@ -264,7 +264,7 @@ class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest { class IndexedDBBrowserTestWithVersion0Schema : public IndexedDBBrowserTestWithPreexistingLevelDB { - virtual std::string EnclosingLevelDBDir() { + virtual std::string EnclosingLevelDBDir() OVERRIDE { return "migration_from_0"; } }; @@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithVersion0Schema, MigrationTest) { class IndexedDBBrowserTestWithVersion123456Schema : public IndexedDBBrowserTestWithPreexistingLevelDB { - virtual std::string EnclosingLevelDBDir() { + virtual std::string EnclosingLevelDBDir() OVERRIDE { return "schema_version_123456"; } }; @@ -291,7 +291,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithVersion123456Schema, class IndexedDBBrowserTestWithVersion987654SSVData : public IndexedDBBrowserTestWithPreexistingLevelDB { - virtual std::string EnclosingLevelDBDir() { + virtual std::string EnclosingLevelDBDir() OVERRIDE { return "ssv_version_987654"; } }; @@ -307,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithVersion987654SSVData, class IndexedDBBrowserTestWithCorruptLevelDB : public IndexedDBBrowserTestWithPreexistingLevelDB { - virtual std::string EnclosingLevelDBDir() { + virtual std::string EnclosingLevelDBDir() OVERRIDE { return "corrupt_leveldb"; } }; diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc index 0eebf4b..fc054fd 100644 --- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc @@ -61,7 +61,7 @@ class IndexedDBQuotaClientTest : public testing::Test { idb_context()->set_data_path_for_testing(indexeddb_dir); } - ~IndexedDBQuotaClientTest() { + virtual ~IndexedDBQuotaClientTest() { // IndexedDBContext needs to be destructed on // BrowserThread::WEBKIT_DEPRECATED, which is also a member variable of this // class. Cause IndexedDBContext's destruction now to ensure that it diff --git a/content/browser/in_process_webkit/indexed_db_unittest.cc b/content/browser/in_process_webkit/indexed_db_unittest.cc index bb71bcc..13334fe 100644 --- a/content/browser/in_process_webkit/indexed_db_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_unittest.cc @@ -138,7 +138,7 @@ class MockWebIDBDatabase : public WebKit::WebIDBDatabase : expect_force_close_(expect_force_close), force_close_called_(false) {} - ~MockWebIDBDatabase() + virtual ~MockWebIDBDatabase() { EXPECT_TRUE(force_close_called_ == expect_force_close_); } diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc index 0fab25e..5fa77c0 100644 --- a/content/browser/loader/async_resource_handler.cc +++ b/content/browser/loader/async_resource_handler.cc @@ -74,7 +74,7 @@ class DependentIOBuffer : public net::WrappedIOBuffer { backing_(backing) { } private: - ~DependentIOBuffer() {} + virtual ~DependentIOBuffer() {} scoped_refptr<ResourceBuffer> backing_; }; diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc index c212eb9..6974142 100644 --- a/content/browser/loader/buffered_resource_handler.cc +++ b/content/browser/loader/buffered_resource_handler.cc @@ -68,7 +68,7 @@ class DependentIOBuffer : public net::WrappedIOBuffer { } private: - ~DependentIOBuffer() {} + virtual ~DependentIOBuffer() {} scoped_refptr<net::IOBuffer> buf_; }; diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index c23e845..b519c4b 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -166,7 +166,7 @@ class MockURLRequestContextSelector : request_context_(request_context) {} virtual net::URLRequestContext* GetRequestContext( - ResourceType::Type request_type) { + ResourceType::Type request_type) OVERRIDE { return request_context_; } @@ -193,7 +193,7 @@ class ForwardingFilter : public ResourceMessageFilter { } // ResourceMessageFilter override - virtual bool Send(IPC::Message* msg) { + virtual bool Send(IPC::Message* msg) OVERRIDE { if (!dest_) return false; return dest_->Send(msg); @@ -237,7 +237,7 @@ class URLRequestTestDelayedStartJob : public net::URLRequestTestJob { } // Do nothing until you're told to. - virtual void Start() {} + virtual void Start() OVERRIDE {} // Finish starting a URL request whose job is an instance of // URLRequestTestDelayedStartJob. It is illegal to call this routine @@ -315,7 +315,7 @@ class URLRequestTestDelayedCompletionJob : public net::URLRequestTestJob { auto_advance) {} protected: - ~URLRequestTestDelayedCompletionJob() {} + virtual ~URLRequestTestDelayedCompletionJob() {} private: virtual bool NextReadAsync() OVERRIDE { return true; } @@ -370,7 +370,7 @@ class TestUserData : public base::SupportsUserData::Data { : was_deleted_(was_deleted) { } - ~TestUserData() { + virtual ~TestUserData() { *was_deleted_ = true; } @@ -383,7 +383,7 @@ class TransfersAllNavigationsContentBrowserClient public: virtual bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context, const GURL& current_url, - const GURL& new_url) { + const GURL& new_url) OVERRIDE { return true; } }; @@ -535,7 +535,7 @@ class ResourceDispatcherHostTest : public testing::Test, this, browser_context_->GetResourceContext()); } // IPC::Sender implementation - virtual bool Send(IPC::Message* msg) { + virtual bool Send(IPC::Message* msg) OVERRIDE { accum_.AddMessage(*msg); if (send_data_received_acks_ && diff --git a/content/browser/media/webrtc_internals_unittest.cc b/content/browser/media/webrtc_internals_unittest.cc index e29bef9..c9237f0 100644 --- a/content/browser/media/webrtc_internals_unittest.cc +++ b/content/browser/media/webrtc_internals_unittest.cc @@ -23,7 +23,7 @@ static const string kUrl = "u"; class MockWebRTCInternalsProxy : public WebRTCInternalsUIObserver { public: - void OnUpdate(const string& command, const Value* value) OVERRIDE { + virtual void OnUpdate(const string& command, const Value* value) OVERRIDE { command_ = command; value_.reset(value->DeepCopy()); } diff --git a/content/browser/net/view_http_cache_job_factory.cc b/content/browser/net/view_http_cache_job_factory.cc index 596a484..a1300e6 100644 --- a/content/browser/net/view_http_cache_job_factory.cc +++ b/content/browser/net/view_http_cache_job_factory.cc @@ -85,7 +85,7 @@ class ViewHttpCacheJob : public net::URLRequestJob { DISALLOW_COPY_AND_ASSIGN(Core); }; - ~ViewHttpCacheJob() {} + virtual ~ViewHttpCacheJob() {} void StartAsync(); void OnStartCompleted(); diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index e749095..4604036 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -34,7 +34,7 @@ class PluginTest : public ContentBrowserTest { protected: PluginTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + 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"); diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc index bf1c6fa..494cc70 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 { MessageLoop::current()->Quit(); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { #ifdef OS_MACOSX base::FilePath browser_directory; PathService::Get(base::DIR_MODULE, &browser_directory); diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 838aec4..8a5e2cc 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -142,7 +142,7 @@ class PluginServiceTest : public ContentBrowserTest { return shell()->web_contents()->GetBrowserContext()->GetResourceContext(); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { #ifdef OS_MACOSX base::FilePath browser_directory; PathService::Get(base::DIR_MODULE, &browser_directory); diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 1ea54d1..dfdf3df 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -38,7 +38,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver net::NetworkChangeNotifier::AddConnectionTypeObserver(this); } - ~PluginNetworkObserver() { + virtual ~PluginNetworkObserver() { net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this); net::NetworkChangeNotifier::RemoveIPAddressObserver(this); } @@ -56,7 +56,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver // ConnectionTypeObserver implementation. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) { + net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { process_host_->Send(new PpapiMsg_SetNetworkState( type != net::NetworkChangeNotifier::CONNECTION_NONE)); } diff --git a/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc b/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc index 379ea1f..62fdaf8 100644 --- a/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc +++ b/content/browser/renderer_host/gtk_key_bindings_handler_unittest.cc @@ -44,7 +44,7 @@ class GtkKeyBindingsHandlerTest : public testing::Test { gtk_widget_show(fixed); gtk_widget_show(window_); } - ~GtkKeyBindingsHandlerTest() { + virtual ~GtkKeyBindingsHandlerTest() { gtk_widget_destroy(window_); delete handler_; } diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index ba45309..908a091 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -208,7 +208,7 @@ class CompositorSwapClient factory_(factory) { } - ~CompositorSwapClient() { + virtual ~CompositorSwapClient() { } virtual void OnViewContextSwapBuffersPosted() OVERRIDE { @@ -434,7 +434,7 @@ class GpuProcessTransportFactory } virtual scoped_refptr<ui::Texture> CreateTransportClient( - float device_scale_factor) { + float device_scale_factor) OVERRIDE { if (!shared_context_.get()) return NULL; scoped_refptr<ImageTransportClientTexture> image( @@ -455,7 +455,7 @@ class GpuProcessTransportFactory return image; } - virtual GLHelper* GetGLHelper() { + virtual GLHelper* GetGLHelper() OVERRIDE { if (!gl_helper_.get()) { CreateSharedContextLazy(); WebKit::WebGraphicsContext3D* context_for_thread = @@ -474,11 +474,12 @@ class GpuProcessTransportFactory return shared_context_->insertSyncPoint(); } - virtual void AddObserver(ImageTransportFactoryObserver* observer) { + virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE { observer_list_.AddObserver(observer); } - virtual void RemoveObserver(ImageTransportFactoryObserver* observer) { + virtual void RemoveObserver( + ImageTransportFactoryObserver* observer) OVERRIDE { observer_list_.RemoveObserver(observer); } diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index e63ed7d..1901cfc 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc @@ -45,7 +45,8 @@ class MockMediaStreamProviderListener : public MediaStreamProviderListener { class MockFrameObserver : public media::VideoCaptureDevice::EventHandler { public: virtual void OnError() OVERRIDE {} - void OnFrameInfo(const media::VideoCaptureCapability& info) {} + virtual void OnFrameInfo( + const media::VideoCaptureCapability& info) OVERRIDE {} virtual void OnIncomingCapturedFrame(const uint8* data, int length, base::Time timestamp) OVERRIDE {} diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc index ce77102..71634df 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc @@ -46,7 +46,7 @@ class FakeServerSocket : public net::ServerSocket { } // net::ServerSocket implementation. - virtual void AllowAddressReuse() { + virtual void AllowAddressReuse() OVERRIDE { } virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE { diff --git a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc index eefa9fc..5a5f15a 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc @@ -104,7 +104,7 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { } } - virtual const net::BoundNetLog& NetLog() const { + virtual const net::BoundNetLog& NetLog() const OVERRIDE { return net_log_; } diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc index 7d0124a..3dfbe2b 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc @@ -28,7 +28,7 @@ class PepperGamepadHostTest public: PepperGamepadHostTest() { } - ~PepperGamepadHostTest() { + virtual ~PepperGamepadHostTest() { } void ConstructService(const WebKit::WebGamepads& test_data) { diff --git a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc index 2237d48..a46db10 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc @@ -50,7 +50,7 @@ class PepperPrintingHostTest PepperPrintingHostTest() { } - ~PepperPrintingHostTest() { + virtual ~PepperPrintingHostTest() { } DISALLOW_COPY_AND_ASSIGN(PepperPrintingHostTest); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 5456ea1..0b4d5b5 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -154,7 +154,7 @@ class OpenChannelToPpapiPluginCallback return filter()->OffTheRecord(); } - virtual ResourceContext* GetResourceContext() { + virtual ResourceContext* GetResourceContext() OVERRIDE { return context_; } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 8a975e8..11c5d9a 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -154,7 +154,7 @@ class RendererMainThread : public base::Thread { new RenderThreadImpl(channel_id_); } - virtual void CleanUp() { + virtual void CleanUp() OVERRIDE { render_process_.reset(); // It's a little lame to manually set this flag. But the single process @@ -193,7 +193,7 @@ class RendererURLRequestContextSelector } virtual net::URLRequestContext* GetRequestContext( - ResourceType::Type resource_type) { + ResourceType::Type resource_type) OVERRIDE { net::URLRequestContextGetter* request_context = request_context_; // If the request has resource type of ResourceType::MEDIA, we use a request // context specific to media for handling it because these resources have diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index a615496..0829620 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -272,7 +272,7 @@ class RenderWidgetHostProcess : public MockRenderProcessHost { update_msg_should_reply_(false), update_msg_reply_flags_(0) { } - ~RenderWidgetHostProcess() { + virtual ~RenderWidgetHostProcess() { delete current_update_buf_; } @@ -286,12 +286,12 @@ class RenderWidgetHostProcess : public MockRenderProcessHost { // Fills the given update parameters with resonable default values. void InitUpdateRectParams(ViewHostMsg_UpdateRect_Params* params); - virtual bool HasConnection() const { return true; } + virtual bool HasConnection() const OVERRIDE { return true; } protected: virtual bool WaitForBackingStoreMsg(int render_widget_id, const base::TimeDelta& max_delay, - IPC::Message* msg); + IPC::Message* msg) OVERRIDE; TransportDIB* current_update_buf_; @@ -451,9 +451,9 @@ class MockPaintingObserver : public NotificationObserver { size_ = size; } - void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + virtual void Observe(int type, + const NotificationSource& source, + const NotificationDetails& details) OVERRIDE { if (type == NOTIFICATION_RENDER_WIDGET_HOST_DID_RECEIVE_PAINT_AT_SIZE_ACK) { std::pair<int, gfx::Size>* size_ack_details = Details<std::pair<int, gfx::Size> >(details).ptr(); @@ -481,12 +481,12 @@ class RenderWidgetHostTest : public testing::Test { public: RenderWidgetHostTest() : process_(NULL) { } - ~RenderWidgetHostTest() { + virtual ~RenderWidgetHostTest() { } protected: // testing::Test - void SetUp() { + virtual void SetUp() { browser_context_.reset(new TestBrowserContext()); delegate_.reset(new MockRenderWidgetHostDelegate()); process_ = new RenderWidgetHostProcess(browser_context_.get()); @@ -500,7 +500,7 @@ class RenderWidgetHostTest : public testing::Test { host_->SetView(view_.get()); host_->Init(); } - void TearDown() { + virtual void TearDown() { view_.reset(); host_.reset(); delegate_.reset(); diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index db93cb5..eaa261b 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -46,7 +46,7 @@ class TestWindowObserver : public aura::WindowObserver { bool destroyed() const { return destroyed_; } // aura::WindowObserver overrides: - virtual void OnWindowDestroyed(aura::Window* window) { + virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE { CHECK_EQ(window, window_); destroyed_ = true; window_ = NULL; diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 7efbe7e..ae569a8 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -25,11 +25,11 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest { public: RenderWidgetHostViewBrowserTest() : finish_called_(false), size_(400, 300) {} - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_)); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { ui::DisableTestCompositor(); } diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index 512e611..f0d1c2d 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -18,9 +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) {} - virtual void RemoveObserver(Observer* observer) {} - virtual ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* results) { + virtual void AddObserver(Observer* observer) OVERRIDE {} + virtual void RemoveObserver(Observer* observer) OVERRIDE {} + virtual ConfigAvailability GetLatestProxyConfig( + net::ProxyConfig* results) OVERRIDE { *results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac")); return CONFIG_VALID; } @@ -69,7 +70,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { scoped_ptr<PendingResult> pending_result_; private: - virtual bool OnMessageReceived(const IPC::Message& msg) { + 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/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index c57f1a6..cd70207 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -23,7 +23,7 @@ class SessionHistoryTest : public ContentBrowserTest { protected: SessionHistoryTest() {} - virtual void SetUpOnMainThread() { + virtual void SetUpOnMainThread() OVERRIDE { ASSERT_TRUE(test_server()->Start()); NavigateToURL(shell(), GURL(chrome::kAboutBlankURL)); } diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index 4bcf56e..a66e5c8 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -62,7 +62,7 @@ class SiteInstanceTestBrowserClient : public TestContentBrowserClient { WebUIControllerFactory::RegisterFactory(&factory_); } - ~SiteInstanceTestBrowserClient() { + virtual ~SiteInstanceTestBrowserClient() { WebUIControllerFactory::UnregisterFactoryForTesting(&factory_); } diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 99ce0c94..d4af058 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -157,7 +157,7 @@ class SitePerProcessBrowserTest : public ContentBrowserTest { return result; } - void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kSitePerProcess); } }; diff --git a/content/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc index 6bfe903..ed5a1fe 100644 --- a/content/browser/speech/endpointer/endpointer_unittest.cc +++ b/content/browser/speech/endpointer/endpointer_unittest.cc @@ -73,7 +73,9 @@ class EnergyEndpointerFrameProcessor : public FrameProcessor { explicit EnergyEndpointerFrameProcessor(EnergyEndpointer* endpointer) : endpointer_(endpointer) {} - EpStatus ProcessFrame(int64 time, int16* samples, int frame_size) { + virtual EpStatus ProcessFrame(int64 time, + int16* samples, + int frame_size) OVERRIDE { endpointer_->ProcessAudioFrame(time, samples, kFrameSize, NULL); int64 ep_time; return endpointer_->Status(&ep_time); @@ -116,7 +118,9 @@ class EndpointerFrameProcessor : public FrameProcessor { explicit EndpointerFrameProcessor(Endpointer* endpointer) : endpointer_(endpointer) {} - EpStatus ProcessFrame(int64 time, int16* samples, int frame_size) { + virtual EpStatus ProcessFrame(int64 time, + int16* samples, + int frame_size) OVERRIDE { scoped_refptr<AudioChunk> frame( new AudioChunk(reinterpret_cast<uint8*>(samples), kFrameSize * 2, 2)); endpointer_->ProcessAudio(*frame, NULL); diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index 768c9e7..b1810f3 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -30,7 +30,7 @@ namespace content { class SpeechRecognitionBrowserTest : public ContentBrowserTest { public: // ContentBrowserTest methods - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableSpeechInput)); } @@ -75,7 +75,7 @@ class SpeechRecognitionBrowserTest : public ContentBrowserTest { } // ContentBrowserTest methods. - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { fake_speech_recognition_manager_.set_should_send_fake_response(true); speech_recognition_manager_ = &fake_speech_recognition_manager_; @@ -84,7 +84,7 @@ class SpeechRecognitionBrowserTest : public ContentBrowserTest { SpeechRecognitionManager::SetManagerForTests(speech_recognition_manager_); } - virtual void TearDownInProcessBrowserTestFixture() { + virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { speech_recognition_manager_ = NULL; } diff --git a/content/browser/tracing/trace_controller_impl.cc b/content/browser/tracing/trace_controller_impl.cc index 4c61591..e0aed6e 100644 --- a/content/browser/tracing/trace_controller_impl.cc +++ b/content/browser/tracing/trace_controller_impl.cc @@ -34,7 +34,7 @@ class AutoStopTraceSubscriberStdio : public TraceSubscriberStdio { // else, the tracing will end asynchronously in OnEndTracingComplete(). } - virtual void OnEndTracingComplete() { + virtual void OnEndTracingComplete() OVERRIDE { TraceSubscriberStdio::OnEndTracingComplete(); delete this; // TODO(joth): this would be the time to automatically open up diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index 05d5c5d..c1c4813 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -62,19 +62,19 @@ class TracingMessageHandler virtual ~TracingMessageHandler(); // WebUIMessageHandler implementation. - virtual void RegisterMessages(); + virtual void RegisterMessages() OVERRIDE; // SelectFileDialog::Listener implementation virtual void FileSelected(const base::FilePath& path, int index, - void* params); - virtual void FileSelectionCanceled(void* params); + void* params) OVERRIDE; + virtual void FileSelectionCanceled(void* params) OVERRIDE; // TraceSubscriber implementation. - virtual void OnEndTracingComplete(); + virtual void OnEndTracingComplete() OVERRIDE; virtual void OnTraceDataCollected( - const scoped_refptr<base::RefCountedString>& trace_fragment); - virtual void OnTraceBufferPercentFullReply(float percent_full); + const scoped_refptr<base::RefCountedString>& trace_fragment) OVERRIDE; + virtual void OnTraceBufferPercentFullReply(float percent_full) OVERRIDE; // Messages. void OnTracingControllerInitialized(const ListValue* list); diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc index 2316c0c..75c25bd7 100644 --- a/content/browser/web_contents/navigation_controller_impl_unittest.cc +++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc @@ -166,7 +166,7 @@ class TestWebContentsDelegate : public WebContentsDelegate { // Keep track of whether the tab has notified us of a navigation state change. virtual void NavigationStateChanged(const WebContents* source, - unsigned changed_flags) { + unsigned changed_flags) OVERRIDE { navigation_state_change_count_++; } @@ -1850,7 +1850,7 @@ class PrunedListener : public NotificationObserver { virtual void Observe(int type, const NotificationSource& source, - const NotificationDetails& details) { + const NotificationDetails& details) OVERRIDE { if (type == NOTIFICATION_NAV_LIST_PRUNED) { notification_count_++; details_ = *(Details<PrunedDetails>(details).ptr()); diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index b72ddeb..1e7da49 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc @@ -216,12 +216,13 @@ class TestInterstitialPageStateGuard : public TestInterstitialPage::Delegate { DCHECK(interstitial_page_); interstitial_page_->set_delegate(this); } - ~TestInterstitialPageStateGuard() { + virtual ~TestInterstitialPageStateGuard() { if (interstitial_page_) interstitial_page_->ClearStates(); } - virtual void TestInterstitialPageDeleted(TestInterstitialPage* interstitial) { + virtual void TestInterstitialPageDeleted( + TestInterstitialPage* interstitial) OVERRIDE { DCHECK(interstitial_page_ == interstitial); interstitial_page_ = NULL; } diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 814ecc8..8336289 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -525,7 +525,7 @@ class WebContentsViewAura::WindowObserver virtual void OnWindowBoundsChanged(aura::Window* window, const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) { + const gfx::Rect& new_bounds) OVERRIDE { SendScreenRects(); } diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 3ffc195..8290b79 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -336,7 +336,7 @@ class ChromeProtocolHandler // |is_incognito| should be set for incognito profiles. explicit ChromeProtocolHandler(content::ResourceContext* resource_context, bool is_incognito); - ~ChromeProtocolHandler(); + virtual ~ChromeProtocolHandler(); virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index c1ec030..5f17e53 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -31,7 +31,7 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource { InternalDataSource(WebUIDataSourceImpl* parent) : parent_(parent) { } - ~InternalDataSource() { + virtual ~InternalDataSource() { } // URLDataSource implementation. diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index 0799ee7..fcd3376 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -69,7 +69,7 @@ class URLRequestContextSelector virtual ~URLRequestContextSelector() {} virtual net::URLRequestContext* GetRequestContext( - ResourceType::Type resource_type) { + ResourceType::Type resource_type) OVERRIDE { if (resource_type == ResourceType::MEDIA) return media_url_request_context_->GetURLRequestContext(); return url_request_context_->GetURLRequestContext(); diff --git a/content/common/fileapi/webfilewriter_impl.cc b/content/common/fileapi/webfilewriter_impl.cc index f441cad..99b2001 100644 --- a/content/common/fileapi/webfilewriter_impl.cc +++ b/content/common/fileapi/webfilewriter_impl.cc @@ -25,27 +25,27 @@ class WebFileWriterImpl::CallbackDispatcher } virtual void DidReadMetadata(const base::PlatformFileInfo&, - const base::FilePath&) { + const base::FilePath&) OVERRIDE { NOTREACHED(); } virtual void DidReadDirectory( const std::vector<base::FileUtilProxy::Entry>& entries, - bool has_more) { + bool has_more) OVERRIDE { NOTREACHED(); } virtual void DidOpenFileSystem(const std::string& name, - const GURL& root) { + const GURL& root) OVERRIDE { NOTREACHED(); } - virtual void DidSucceed() { + virtual void DidSucceed() OVERRIDE { if (writer_) writer_->DidSucceed(); } - virtual void DidFail(base::PlatformFileError error_code) { + virtual void DidFail(base::PlatformFileError error_code) OVERRIDE { if (writer_) writer_->DidFail(error_code); } - virtual void DidWrite(int64 bytes, bool complete) { + virtual void DidWrite(int64 bytes, bool complete) OVERRIDE { if (writer_) writer_->DidWrite(bytes, complete); } diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index ac032cb..0d555e5 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -58,17 +58,17 @@ class MailboxMessageFilter : public IPC::ChannelProxy::MessageFilter { DCHECK(success); } - virtual void OnFilterAdded(IPC::Channel* channel) { + virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE { DCHECK(!channel_); channel_ = channel; } - virtual void OnFilterRemoved() { + virtual void OnFilterRemoved() OVERRIDE { DCHECK(channel_); channel_ = NULL; } - virtual bool OnMessageReceived(const IPC::Message& message) { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { DCHECK(channel_); bool handled = true; @@ -88,7 +88,7 @@ class MailboxMessageFilter : public IPC::ChannelProxy::MessageFilter { } private: - ~MailboxMessageFilter() { + virtual ~MailboxMessageFilter() { } // Message handlers. @@ -144,17 +144,17 @@ class SyncPointMessageFilter : public IPC::ChannelProxy::MessageFilter { unprocessed_messages_(unprocessed_messages) { } - virtual void OnFilterAdded(IPC::Channel* channel) { + virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE { DCHECK(!channel_); channel_ = channel; } - virtual void OnFilterRemoved() { + virtual void OnFilterRemoved() OVERRIDE { DCHECK(channel_); channel_ = NULL; } - virtual bool OnMessageReceived(const IPC::Message& message) { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { DCHECK(channel_); base::AtomicRefCountInc(unprocessed_messages_.get()); if (!timer_.IsRunning()) diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index c7a2cc1..de8d196 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -49,19 +49,20 @@ class GpuCommandBufferMemoryTracker : public gpu::gles2::MemoryTracker { CreateTrackingGroup(channel->renderer_pid(), this)) { } - void TrackMemoryAllocatedChange(size_t old_size, - size_t new_size, - gpu::gles2::MemoryTracker::Pool pool) { + virtual void TrackMemoryAllocatedChange( + size_t old_size, + size_t new_size, + gpu::gles2::MemoryTracker::Pool pool) OVERRIDE { tracking_group_->TrackMemoryAllocatedChange( old_size, new_size, pool); } - virtual bool EnsureGPUMemoryAvailable(size_t size_needed) { + virtual bool EnsureGPUMemoryAvailable(size_t size_needed) OVERRIDE { return tracking_group_->EnsureGPUMemoryAvailable(size_needed); }; private: - ~GpuCommandBufferMemoryTracker() { + virtual ~GpuCommandBufferMemoryTracker() { } scoped_ptr<GpuMemoryTrackingGroup> tracking_group_; diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc index b9c3727..4153d62 100644 --- a/content/common/gpu/gpu_memory_manager_unittest.cc +++ b/content/common/gpu/gpu_memory_manager_unittest.cc @@ -26,13 +26,13 @@ class FakeMemoryTracker : public gpu::gles2::MemoryTracker { virtual void TrackMemoryAllocatedChange( size_t /* old_size */, size_t /* new_size */, - gpu::gles2::MemoryTracker::Pool /* pool */) { + gpu::gles2::MemoryTracker::Pool /* pool */) OVERRIDE { } - virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) { + virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) OVERRIDE { return true; } private: - ~FakeMemoryTracker() { + virtual ~FakeMemoryTracker() { } }; @@ -109,18 +109,18 @@ class FakeClient : public GpuMemoryManagerClient { this, surface_id != 0, visible)); } - ~FakeClient() { + virtual ~FakeClient() { client_state_.reset(); tracking_group_.reset(); memory_tracker_ = NULL; } - void SetMemoryAllocation(const GpuMemoryAllocation& alloc) { + virtual void SetMemoryAllocation(const GpuMemoryAllocation& alloc) OVERRIDE { allocation_ = alloc; ClientAssignmentCollector::AddClientStat(this, alloc); } - bool GetTotalGpuMemory(uint64* bytes) { + virtual bool GetTotalGpuMemory(uint64* bytes) OVERRIDE { if (total_gpu_memory_) { *bytes = total_gpu_memory_; return true; @@ -129,13 +129,13 @@ class FakeClient : public GpuMemoryManagerClient { } void SetTotalGpuMemory(uint64 bytes) { total_gpu_memory_ = bytes; } - gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE { + virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE { if (share_group_) return share_group_->GetMemoryTracker(); return memory_tracker_.get(); } - gfx::Size GetSurfaceSize() const { + virtual gfx::Size GetSurfaceSize() const OVERRIDE { return surface_size_; } void SetSurfaceSize(gfx::Size size) { surface_size_ = size; } diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index 8da4da3..d86aca3 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -218,15 +218,15 @@ class GLRenderingVDAClient : public VideoDecodeAccelerator::Client { // The heart of the Client. virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target); - virtual void DismissPictureBuffer(int32 picture_buffer_id); - virtual void PictureReady(const media::Picture& picture); + uint32 texture_target) OVERRIDE; + virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; + virtual void PictureReady(const media::Picture& picture) OVERRIDE; // Simple state changes. - virtual void NotifyInitializeDone(); - virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id); - virtual void NotifyFlushDone(); - virtual void NotifyResetDone(); - virtual void NotifyError(VideoDecodeAccelerator::Error error); + virtual void NotifyInitializeDone() OVERRIDE; + virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE; + virtual void NotifyFlushDone() OVERRIDE; + virtual void NotifyResetDone() OVERRIDE; + virtual void NotifyError(VideoDecodeAccelerator::Error error) OVERRIDE; // Simple getters for inspecting the state of the Client. int num_done_bitstream_buffers() { return num_done_bitstream_buffers_; } diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc index 63a794c..ce49f4e 100644 --- a/content/common/resource_dispatcher.cc +++ b/content/common/resource_dispatcher.cc @@ -58,11 +58,11 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge { virtual ~IPCResourceLoaderBridge(); // ResourceLoaderBridge - virtual void SetRequestBody(ResourceRequestBody* request_body); - virtual bool Start(Peer* peer); - virtual void Cancel(); - virtual void SetDefersLoading(bool value); - virtual void SyncLoad(SyncLoadResponse* response); + virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE; + virtual bool Start(Peer* peer) OVERRIDE; + virtual void Cancel() OVERRIDE; + virtual void SetDefersLoading(bool value) OVERRIDE; + virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE; private: ResourceLoaderBridge::Peer* peer_; diff --git a/content/common/resource_dispatcher_unittest.cc b/content/common/resource_dispatcher_unittest.cc index d27b6a1..df65112 100644 --- a/content/common/resource_dispatcher_unittest.cc +++ b/content/common/resource_dispatcher_unittest.cc @@ -72,7 +72,7 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer { int error_code, bool was_ignored_by_handler, const std::string& security_info, - const base::TimeTicks& completion_time) { + const base::TimeTicks& completion_time) OVERRIDE { EXPECT_FALSE(complete_); complete_ = true; } @@ -99,7 +99,7 @@ class ResourceDispatcherTest : public testing::Test, public IPC::Sender { public: // Emulates IPC send operations (IPC::Sender) by adding // pending messages to the queue. - virtual bool Send(IPC::Message* msg) { + virtual bool Send(IPC::Message* msg) OVERRIDE { message_queue_.push_back(IPC::Message(*msg)); delete msg; return true; @@ -298,7 +298,7 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest, int error_code, bool was_ignored_by_handler, const std::string& security_info, - const base::TimeTicks& completion_time) { + const base::TimeTicks& completion_time) OVERRIDE { } protected: @@ -365,7 +365,7 @@ class TimeConversionTest : public ResourceDispatcherTest, const GURL& new_url, const ResourceResponseInfo& info, bool* has_new_first_party_for_cookies, - GURL* new_first_party_for_cookies) { + GURL* new_first_party_for_cookies) OVERRIDE { return true; } diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc index 7067941..13a7ddf 100644 --- a/content/common/socket_stream_dispatcher.cc +++ b/content/common/socket_stream_dispatcher.cc @@ -39,9 +39,9 @@ class IPCWebSocketStreamHandleBridge static IPCWebSocketStreamHandleBridge* FromSocketId(int id); // webkit_glue::WebSocketStreamHandleBridge methods. - virtual void Connect(const GURL& url); - virtual bool Send(const std::vector<char>& data); - virtual void Close(); + virtual void Connect(const GURL& url) OVERRIDE; + virtual bool Send(const std::vector<char>& data) OVERRIDE; + virtual void Close() OVERRIDE; // Called by SocketStreamDispatcher. void OnConnected(int max_amount_send_allowed); diff --git a/content/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc index 3de8d60..825b29b 100644 --- a/content/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -18,7 +18,7 @@ class GPUInfoCollectorTest : public testing::Test { GPUInfoCollectorTest() {} virtual ~GPUInfoCollectorTest() { } - void SetUp() { + virtual void SetUp() { // TODO(kbr): make this setup robust in the case where // GLSurface::InitializeOneOff() has already been called by // another unit test. http://crbug.com/100285 @@ -98,7 +98,7 @@ class GPUInfoCollectorTest : public testing::Test { gl_renderer))); } - void TearDown() { + virtual void TearDown() { ::gfx::GLInterface::SetGLInterface(NULL); gl_.reset(); } diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index aef0ec4..79754fa 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -78,9 +78,11 @@ class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter { } // IPC::ChannelProxy::MessageFilter: - void OnFilterAdded(IPC::Channel* channel) { channel_ = channel; } + virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE { + channel_ = channel; + } - bool OnMessageReceived(const IPC::Message& message) { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { IPC_BEGIN_MESSAGE_MAP(PluginChannel::MessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_Init, OnInit) IPC_MESSAGE_HANDLER(PluginMsg_SignalModalDialogEvent, diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 3182158..ea0cbc1 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -51,7 +51,7 @@ class EnsureTerminateMessageFilter : public IPC::ChannelProxy::MessageFilter { virtual ~EnsureTerminateMessageFilter() {} // IPC::ChannelProxy::MessageFilter: - virtual void OnChannelError() { + virtual void OnChannelError() OVERRIDE { // How long we wait before forcibly shutting down the process. const base::TimeDelta kPluginProcessTerminateTimeout = base::TimeDelta::FromSeconds(3); diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc index 14aba11..2a0c690 100644 --- a/content/public/test/test_file_error_injector.cc +++ b/content/public/test/test_file_error_injector.cc @@ -42,7 +42,7 @@ class DownloadFileWithErrors: public DownloadFileImpl { const ConstructionCallback& ctor_callback, const DestructionCallback& dtor_callback); - ~DownloadFileWithErrors(); + virtual ~DownloadFileWithErrors(); virtual void Initialize(const InitializeCallback& callback) OVERRIDE; diff --git a/content/public/test/web_contents_tester.cc b/content/public/test/web_contents_tester.cc index d6e2fdf..4896d4d 100644 --- a/content/public/test/web_contents_tester.cc +++ b/content/public/test/web_contents_tester.cc @@ -38,7 +38,9 @@ class TestWebContentsCountSetFocusToLocationBar : public TestWebContents { : TestWebContents(browser_context), focus_called_(0) { } - virtual void SetFocusToLocationBar(bool select_all) { ++focus_called_; } + virtual void SetFocusToLocationBar(bool select_all) OVERRIDE { + ++focus_called_; + } virtual int GetNumberOfFocusCalls() OVERRIDE { return focus_called_; } diff --git a/content/renderer/all_rendering_benchmarks.cc b/content/renderer/all_rendering_benchmarks.cc index ddc2996..cc8092a 100644 --- a/content/renderer/all_rendering_benchmarks.cc +++ b/content/renderer/all_rendering_benchmarks.cc @@ -173,7 +173,7 @@ class TiledReplayBenchmark } } - virtual double Run(WebViewBenchmarkSupport* support) { + virtual double Run(WebViewBenchmarkSupport* support) OVERRIDE { paint_time_total_ = TimeDelta(); support->paint(this, paint_mode_); return paint_time_total_.InMillisecondsF(); diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 299c5f3..cdfc2a0 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -87,20 +87,20 @@ class RenderingStatsEnumerator : public cc::RenderingStats::Enumerator { RenderingStatsEnumerator(v8::Handle<v8::Object> stats_object) : stats_object(stats_object) { } - virtual void AddInt64(const char* name, int64 value) { + virtual void AddInt64(const char* name, int64 value) OVERRIDE { stats_object->Set(v8::String::New(name), v8::Number::New(value)); } - virtual void AddDouble(const char* name, double value) { + virtual void AddDouble(const char* name, double value) OVERRIDE { stats_object->Set(v8::String::New(name), v8::Number::New(value)); } - virtual void AddInt(const char* name, int value) { + virtual void AddInt(const char* name, int value) OVERRIDE { stats_object->Set(v8::String::New(name), v8::Integer::New(value)); } virtual void AddTimeDeltaInSecondsF(const char* name, - const base::TimeDelta& value) { + const base::TimeDelta& value) OVERRIDE { stats_object->Set(v8::String::New(name), v8::Number::New(value.InSecondsF())); } @@ -157,7 +157,7 @@ class GpuBenchmarkingWrapper : public v8::Extension { "};") {} virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( - v8::Handle<v8::String> name) { + v8::Handle<v8::String> name) OVERRIDE { if (name->Equals(v8::String::New("GetRenderingStats"))) return v8::FunctionTemplate::New(GetRenderingStats); if (name->Equals(v8::String::New("PrintToSkPicture"))) diff --git a/content/renderer/gpu/input_event_filter_unittest.cc b/content/renderer/gpu/input_event_filter_unittest.cc index 9651d46..32b7bc1 100644 --- a/content/renderer/gpu/input_event_filter_unittest.cc +++ b/content/renderer/gpu/input_event_filter_unittest.cc @@ -73,7 +73,7 @@ class InputEventRecorder { class IPCMessageRecorder : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { messages_.push_back(message); return true; } diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index cf77874f..6bdc388 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -129,7 +129,7 @@ class SourceStateObserver : public webrtc::ObserverInterface, CheckIfSourcesAreLive(); } - virtual void OnChanged() { + virtual void OnChanged() OVERRIDE { DCHECK(CalledOnValidThread()); CheckIfSourcesAreLive(); } diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc index 5e93b96..638f83f 100644 --- a/content/renderer/media/media_stream_dependency_factory_unittest.cc +++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc @@ -45,7 +45,7 @@ class MediaSourceCreatedObserver { class MediaStreamDependencyFactoryTest : public ::testing::Test { public: - void SetUp() { + virtual void SetUp() { dependency_factory_.reset(new MockMediaStreamDependencyFactory()); } diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc index 1f47127..c56f930 100644 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ b/content/renderer/media/media_stream_impl_unittest.cc @@ -76,7 +76,7 @@ class MediaStreamImplUnderTest : public MediaStreamImpl { class MediaStreamImplTest : public ::testing::Test { public: - void SetUp() { + virtual void SetUp() { // Create our test object. ms_dispatcher_.reset(new MockMediaStreamDispatcher()); scoped_refptr<VideoCaptureImplManager> vc_manager( diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc index 0e7cc56..5b7c35b 100644 --- a/content/renderer/media/mock_media_stream_dependency_factory.cc +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc @@ -108,7 +108,7 @@ class MockLocalMediaStream : public webrtc::LocalMediaStreamInterface { virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE { NOTIMPLEMENTED(); } - virtual void UnregisterObserver(ObserverInterface* observer) { + virtual void UnregisterObserver(ObserverInterface* observer) OVERRIDE { NOTIMPLEMENTED(); } diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index 56a754f8..4cab2ed 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -122,7 +122,7 @@ class MockDataChannel : public webrtc::DataChannelInterface { } protected: - ~MockDataChannel() {} + virtual ~MockDataChannel() {} private: std::string label_; diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index ce209d8..75f6d5f 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -227,7 +227,8 @@ class StatsResponse : public webrtc::StatsObserver { : request_(request), response_(request_->createResponse()) {} - virtual void OnComplete(const std::vector<webrtc::StatsReport>& reports) { + virtual void OnComplete( + const std::vector<webrtc::StatsReport>& reports) OVERRIDE { for (std::vector<webrtc::StatsReport>::const_iterator it = reports.begin(); it != reports.end(); ++it) { int idx = response_->addReport(); diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index aee202b..ee30a30 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -191,7 +191,7 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test { RTCPeerConnectionHandlerTest() : mock_peer_connection_(NULL) { } - void SetUp() { + virtual void SetUp() { mock_client_.reset(new MockWebRTCPeerConnectionHandlerClient()); mock_dependency_factory_.reset(new MockMediaStreamDependencyFactory()); mock_dependency_factory_->EnsurePeerConnectionFactory(); diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index 545fc18..4b181d8 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc @@ -68,7 +68,7 @@ class VideoCaptureImplTest : public ::testing::Test { virtual ~MockVideoCaptureImpl() {} // Override Send() to mimic device to send events. - void Send(IPC::Message* message) { + virtual void Send(IPC::Message* message) OVERRIDE { CHECK(message); // In this method, messages are sent to the according handlers as if diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc index 4c6205b..a2a4cd6 100644 --- a/content/renderer/media/video_capture_message_filter_unittest.cc +++ b/content/renderer/media/video_capture_message_filter_unittest.cc @@ -20,31 +20,32 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate { } virtual void OnBufferCreated(base::SharedMemoryHandle handle, - int length, int buffer_id) { + int length, int buffer_id) OVERRIDE { buffer_created_ = true; handle_ = handle; } // Called when a video frame buffer is received from the browser process. - virtual void OnBufferReceived(int buffer_id, base::Time timestamp) { + virtual void OnBufferReceived(int buffer_id, base::Time timestamp) OVERRIDE { buffer_received_ = true; buffer_id_ = buffer_id; timestamp_ = timestamp; } - virtual void OnStateChanged(VideoCaptureState state) { + virtual void OnStateChanged(VideoCaptureState state) OVERRIDE { state_changed_received_ = true; state_ = state; } - virtual void OnDeviceInfoReceived(const media::VideoCaptureParams& params) { + virtual void OnDeviceInfoReceived( + const media::VideoCaptureParams& params) OVERRIDE { device_info_received_ = true; params_.width = params.width; params_.height = params.height; params_.frame_per_second = params.frame_per_second; } - virtual void OnDelegateAdded(int32 device_id) { + virtual void OnDelegateAdded(int32 device_id) OVERRIDE { device_id_received_ = true; device_id_ = device_id; } diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc index 53d1c76..159da0d 100644 --- a/content/renderer/media/webrtc_audio_device_unittest.cc +++ b/content/renderer/media/webrtc_audio_device_unittest.cc @@ -125,7 +125,7 @@ class WebRTCMediaProcessImpl : public webrtc::VoEMediaProcess { WebRtc_Word16 audio_10ms[], const int length, const int sampling_freq, - const bool is_stereo) { + const bool is_stereo) OVERRIDE { base::AutoLock auto_lock(lock_); channel_id_ = channel; type_ = type; diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc index 230d99b..ea53678 100644 --- a/content/renderer/p2p/ipc_socket_factory.cc +++ b/content/renderer/p2p/ipc_socket_factory.cc @@ -31,23 +31,23 @@ class IpcPacketSocket : public talk_base::AsyncPacketSocket, const talk_base::SocketAddress& remote_address); // talk_base::AsyncPacketSocket interface. - virtual talk_base::SocketAddress GetLocalAddress() const; - virtual talk_base::SocketAddress GetRemoteAddress() const; - virtual int Send(const void *pv, size_t cb); + virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE; + virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE; + virtual int Send(const void *pv, size_t cb) OVERRIDE; virtual int SendTo(const void *pv, size_t cb, - const talk_base::SocketAddress& addr); - virtual int Close(); - virtual State GetState() const; - virtual int GetOption(talk_base::Socket::Option opt, int* value); - virtual int SetOption(talk_base::Socket::Option opt, int value); - virtual int GetError() const; - virtual void SetError(int error); + const talk_base::SocketAddress& addr) OVERRIDE; + virtual int Close() OVERRIDE; + virtual State GetState() const OVERRIDE; + virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE; + virtual int SetOption(talk_base::Socket::Option opt, int value) OVERRIDE; + virtual int GetError() const OVERRIDE; + virtual void SetError(int error) OVERRIDE; // P2PSocketClient::Delegate implementation. virtual void OnOpen(const net::IPEndPoint& address) OVERRIDE; virtual void OnIncomingTcpConnection(const net::IPEndPoint& address, P2PSocketClient* client) OVERRIDE; - virtual void OnError(); + virtual void OnError() OVERRIDE; virtual void OnDataReceived(const net::IPEndPoint& address, const std::vector<char>& data) OVERRIDE; diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 5fdd139..1d4d449 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -266,36 +266,36 @@ class AsyncOpenFileSystemURLCallbackTranslator virtual ~AsyncOpenFileSystemURLCallbackTranslator() {} - virtual void DidSucceed() { + virtual void DidSucceed() OVERRIDE { NOTREACHED(); } virtual void DidReadMetadata( const base::PlatformFileInfo& file_info, - const FilePath& platform_path) { + const FilePath& platform_path) OVERRIDE { NOTREACHED(); } virtual void DidReadDirectory( const std::vector<base::FileUtilProxy::Entry>& entries, - bool has_more) { + bool has_more) OVERRIDE { NOTREACHED(); } virtual void DidOpenFileSystem(const std::string& name, - const GURL& root) { + const GURL& root) OVERRIDE { NOTREACHED(); } - virtual void DidFail(base::PlatformFileError error_code) { + virtual void DidFail(base::PlatformFileError error_code) OVERRIDE { base::PlatformFile invalid_file = base::kInvalidPlatformFileValue; callback_.Run(error_code, base::PassPlatformFile(&invalid_file), webkit::ppapi::PluginDelegate::NotifyCloseFileCallback()); } - virtual void DidWrite(int64 bytes, bool complete) { + virtual void DidWrite(int64 bytes, bool complete) OVERRIDE { NOTREACHED(); } - virtual void DidOpenFile(base::PlatformFile file) { + virtual void DidOpenFile(base::PlatformFile file) OVERRIDE { callback_.Run(base::PLATFORM_FILE_OK, base::PassPlatformFile(&file), close_file_callback_); diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index b9450b60..dfdffb0 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -57,9 +57,11 @@ class IsListeningFilter : public IPC::ChannelProxy::MessageFilter { IsListeningFilter() : channel_(NULL) {} // MessageFilter overrides - virtual void OnFilterRemoved() {} - virtual void OnFilterAdded(IPC::Channel* channel) { channel_ = channel; } - virtual bool OnMessageReceived(const IPC::Message& message); + virtual void OnFilterRemoved() OVERRIDE {} + virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE { + channel_ = channel; + } + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; static bool is_listening_; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 1c21601..7ee9da4 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -146,7 +146,7 @@ class RenderViewZoomer : public RenderViewVisitor { : host_(host), zoom_level_(zoom_level) { } - virtual bool Visit(RenderView* render_view) { + virtual bool Visit(RenderView* render_view) OVERRIDE { WebView* webview = render_view->GetWebView(); WebDocument document = webview->mainFrame()->document(); diff --git a/content/renderer/render_thread_impl_unittest.cc b/content/renderer/render_thread_impl_unittest.cc index 7f8c325..89cafc1 100644 --- a/content/renderer/render_thread_impl_unittest.cc +++ b/content/renderer/render_thread_impl_unittest.cc @@ -14,7 +14,7 @@ class RenderThreadImplUnittest : public testing::Test { RenderThreadImplUnittest() : kCustomizableHistogram_("Histogram1"), kNormalHistogram_("Histogram2") {} - ~RenderThreadImplUnittest() {} + virtual ~RenderThreadImplUnittest() {} protected: virtual void SetUp() OVERRIDE { histogram_customizer_.custom_histograms_.clear(); diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index 82dd4fa..57ddfac 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -26,8 +26,8 @@ class RendererClipboardWriteContext : virtual ~RendererClipboardWriteContext(); virtual void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects, const void* pixels, - const gfx::Size& size); - virtual void Flush(const ui::Clipboard::ObjectMap& objects); + const gfx::Size& size) OVERRIDE; + virtual void Flush(const ui::Clipboard::ObjectMap& objects) OVERRIDE; private: scoped_ptr<base::SharedMemory> shared_buf_; diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index b5055b7..88865da 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc @@ -49,7 +49,7 @@ class WebUIExtensionWrapper : public v8::Extension { virtual ~WebUIExtensionWrapper(); virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( - v8::Handle<v8::String> name); + v8::Handle<v8::String> name) OVERRIDE; static v8::Handle<v8::Value> Send(const v8::Arguments& args); static v8::Handle<v8::Value> GetVariableValue(const v8::Arguments& args); diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index efca26a2..8cfa6f0 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -106,7 +106,7 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient { multibyte_response_expected_(false) { } - ~ResourceClientProxy() { + virtual ~ResourceClientProxy() { } void Initialize(unsigned long resource_id, const GURL& url, int notify_id) { @@ -124,17 +124,17 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient { } // PluginResourceClient implementation: - void WillSendRequest(const GURL& url, int http_status_code) { + virtual void WillSendRequest(const GURL& url, int http_status_code) OVERRIDE { DCHECK(channel_ != NULL); channel_->Send(new PluginMsg_WillSendRequest(instance_id_, resource_id_, url, http_status_code)); } - void DidReceiveResponse(const std::string& mime_type, - const std::string& headers, - uint32 expected_length, - uint32 last_modified, - bool request_is_seekable) { + virtual void DidReceiveResponse(const std::string& mime_type, + const std::string& headers, + uint32 expected_length, + uint32 last_modified, + bool request_is_seekable) OVERRIDE { DCHECK(channel_ != NULL); PluginMsg_DidReceiveResponseParams params; params.id = resource_id_; @@ -149,7 +149,9 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient { channel_->Send(new PluginMsg_DidReceiveResponse(instance_id_, params)); } - void DidReceiveData(const char* buffer, int length, int data_offset) { + virtual void DidReceiveData(const char* buffer, + int length, + int data_offset) OVERRIDE { DCHECK(channel_ != NULL); DCHECK_GT(length, 0); std::vector<char> data; @@ -162,25 +164,25 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient { data, data_offset)); } - void DidFinishLoading() { + virtual void DidFinishLoading() OVERRIDE { DCHECK(channel_ != NULL); channel_->Send(new PluginMsg_DidFinishLoading(instance_id_, resource_id_)); channel_ = NULL; MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - void DidFail() { + virtual void DidFail() OVERRIDE { DCHECK(channel_ != NULL); channel_->Send(new PluginMsg_DidFail(instance_id_, resource_id_)); channel_ = NULL; MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - bool IsMultiByteResponseExpected() { + virtual bool IsMultiByteResponseExpected() OVERRIDE { return multibyte_response_expected_; } - int ResourceId() { + virtual int ResourceId() OVERRIDE { return resource_id_; } diff --git a/content/test/gpu/gpu_test_config_unittest.cc b/content/test/gpu/gpu_test_config_unittest.cc index 5abcfdb..f58139f 100644 --- a/content/test/gpu/gpu_test_config_unittest.cc +++ b/content/test/gpu/gpu_test_config_unittest.cc @@ -13,9 +13,9 @@ class GPUTestConfigTest : public testing::Test { virtual ~GPUTestConfigTest() { } protected: - void SetUp() { } + virtual void SetUp() { } - void TearDown() { } + virtual void TearDown() { } }; TEST_F(GPUTestConfigTest, EmptyValues) { diff --git a/content/test/gpu/gpu_test_expectations_parser_unittest.cc b/content/test/gpu/gpu_test_expectations_parser_unittest.cc index 0651f24..f5f3d95 100644 --- a/content/test/gpu/gpu_test_expectations_parser_unittest.cc +++ b/content/test/gpu/gpu_test_expectations_parser_unittest.cc @@ -17,7 +17,7 @@ class GPUTestExpectationsParserTest : public testing::Test { } protected: - void SetUp() { + virtual void SetUp() { bot_config_.set_os(GPUTestConfig::kOsWin7); bot_config_.set_build_type(GPUTestConfig::kBuildTypeRelease); bot_config_.AddGPUVendor(0x10de); @@ -25,7 +25,7 @@ class GPUTestExpectationsParserTest : public testing::Test { ASSERT_TRUE(bot_config_.IsValid()); } - void TearDown() { } + virtual void TearDown() { } private: GPUTestBotConfig bot_config_; diff --git a/content/test/net/url_request_prepackaged_interceptor.cc b/content/test/net/url_request_prepackaged_interceptor.cc index 11ad222..f8603ef 100644 --- a/content/test/net/url_request_prepackaged_interceptor.cc +++ b/content/test/net/url_request_prepackaged_interceptor.cc @@ -25,7 +25,7 @@ class URLRequestPrepackagedJob : public net::URLRequestFileJob { const base::FilePath& file_path) : net::URLRequestFileJob(request, network_delegate, file_path) {} - virtual int GetResponseCode() const { return 200; } + virtual int GetResponseCode() const OVERRIDE { return 200; } private: virtual ~URLRequestPrepackagedJob() {} diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc index 13f79c8..e9a3c48 100644 --- a/content/test/webrtc_audio_device_test.cc +++ b/content/test/webrtc_audio_device_test.cc @@ -62,9 +62,11 @@ class WebRTCMockRenderProcess : public RenderProcess { virtual void ReleaseTransportDIB(TransportDIB* memory) OVERRIDE {} virtual bool UseInProcessPlugins() const OVERRIDE { return false; } virtual void AddBindings(int bindings) OVERRIDE {} - virtual int GetEnabledBindings() const { return 0; } - virtual TransportDIB* CreateTransportDIB(size_t size) { return NULL; } - virtual void FreeTransportDIB(TransportDIB*) {} + virtual int GetEnabledBindings() const OVERRIDE { return 0; } + virtual TransportDIB* CreateTransportDIB(size_t size) OVERRIDE { + return NULL; + } + virtual void FreeTransportDIB(TransportDIB*) OVERRIDE {} private: DISALLOW_COPY_AND_ASSIGN(WebRTCMockRenderProcess); |