diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 02:00:58 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 02:00:58 +0000 |
commit | be9826e6bcbc3ccd52816f4122fc885139867ef5 (patch) | |
tree | 0139107baeb407ec1f621f73d5affeff99b39133 | |
parent | 086e6660ce1a6d723ae0b926ca76e267d57d351e (diff) | |
download | chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.zip chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.tar.gz chromium_src-be9826e6bcbc3ccd52816f4122fc885139867ef5.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, chrome/ edition part 1.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files.
BUG=115047
TBR=sky
Review URL: https://codereview.chromium.org/12226045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181140 0039d316-1c4b-4281-b951-d872f2087c98
40 files changed, 136 insertions, 127 deletions
diff --git a/chrome/common/extensions/unpacker_unittest.cc b/chrome/common/extensions/unpacker_unittest.cc index b6efe10..a7dd825 100644 --- a/chrome/common/extensions/unpacker_unittest.cc +++ b/chrome/common/extensions/unpacker_unittest.cc @@ -26,7 +26,7 @@ namespace extensions { class UnpackerTest : public testing::Test { public: - ~UnpackerTest() { + virtual ~UnpackerTest() { LOG(WARNING) << "Deleting temp dir: " << temp_dir_.path().LossyDisplayName(); LOG(WARNING) << temp_dir_.Delete(); diff --git a/chrome/common/json_schema_validator_unittest.cc b/chrome/common/json_schema_validator_unittest.cc index ca4b388..5ea8d1c 100644 --- a/chrome/common/json_schema_validator_unittest.cc +++ b/chrome/common/json_schema_validator_unittest.cc @@ -16,7 +16,7 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase { protected: virtual void ExpectValid(const std::string& test_source, Value* instance, DictionaryValue* schema, - ListValue* types) { + ListValue* types) OVERRIDE { JSONSchemaValidator validator(schema, types); if (validator.Validate(instance)) return; @@ -28,11 +28,12 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase { } } - virtual void ExpectNotValid(const std::string& test_source, - Value* instance, DictionaryValue* schema, - ListValue* types, - const std::string& expected_error_path, - const std::string& expected_error_message) { + virtual void ExpectNotValid( + const std::string& test_source, + Value* instance, DictionaryValue* schema, + ListValue* types, + const std::string& expected_error_path, + const std::string& expected_error_message) OVERRIDE { JSONSchemaValidator validator(schema, types); if (validator.Validate(instance)) { ADD_FAILURE() << test_source; diff --git a/chrome/common/metrics/entropy_provider_unittest.cc b/chrome/common/metrics/entropy_provider_unittest.cc index 334a9ff..409404f 100644 --- a/chrome/common/metrics/entropy_provider_unittest.cc +++ b/chrome/common/metrics/entropy_provider_unittest.cc @@ -79,7 +79,7 @@ class SHA1EntropyGenerator : public TrialEntropyGenerator { : trial_name_(trial_name) { } - ~SHA1EntropyGenerator() { + virtual ~SHA1EntropyGenerator() { } virtual double GenerateEntropyValue() const OVERRIDE { @@ -110,7 +110,7 @@ class PermutedEntropyGenerator : public TrialEntropyGenerator { internal::PermuteMappingUsingTrialName(trial_name, &mapping_); } - ~PermutedEntropyGenerator() { + virtual ~PermutedEntropyGenerator() { } virtual double GenerateEntropyValue() const OVERRIDE { diff --git a/chrome/common/metrics/metrics_log_manager_unittest.cc b/chrome/common/metrics/metrics_log_manager_unittest.cc index dc58454..14fc35f 100644 --- a/chrome/common/metrics/metrics_log_manager_unittest.cc +++ b/chrome/common/metrics/metrics_log_manager_unittest.cc @@ -21,12 +21,12 @@ class MetricsLogManagerTest : public testing::Test { class DummyLogSerializer : public MetricsLogManager::LogSerializer { public: virtual void SerializeLogs(const std::vector<SerializedLog>& logs, - MetricsLogManager::LogType log_type) { + MetricsLogManager::LogType log_type) OVERRIDE { persisted_logs_[log_type] = logs; } virtual void DeserializeLogs(MetricsLogManager::LogType log_type, - std::vector<SerializedLog>* logs) { + std::vector<SerializedLog>* logs) OVERRIDE { ASSERT_NE(static_cast<void*>(NULL), logs); *logs = persisted_logs_[log_type]; } diff --git a/chrome/common/multi_process_lock_linux.cc b/chrome/common/multi_process_lock_linux.cc index 52fc2ba9..c3494aa 100644 --- a/chrome/common/multi_process_lock_linux.cc +++ b/chrome/common/multi_process_lock_linux.cc @@ -9,6 +9,7 @@ #include <sys/un.h> #include <unistd.h> +#include "base/compiler_specific.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -23,7 +24,7 @@ class MultiProcessLockLinux : public MultiProcessLock { } } - virtual bool TryLock() { + virtual bool TryLock() OVERRIDE { struct sockaddr_un address; // +1 for terminator, +1 for 0 in position 0 that makes it an @@ -84,7 +85,7 @@ class MultiProcessLockLinux : public MultiProcessLock { } } - virtual void Unlock() { + virtual void Unlock() OVERRIDE { if (fd_ == -1) { DLOG(ERROR) << "Over-unlocked MultiProcessLock - " << name_; return; diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index a875c0d..618fc66 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -68,7 +68,7 @@ TEST(ServiceProcessUtilTest, ScopedVersionedName) { class ServiceProcessStateTest : public base::MultiProcessTest { public: ServiceProcessStateTest(); - ~ServiceProcessStateTest(); + virtual ~ServiceProcessStateTest(); virtual void SetUp(); base::MessageLoopProxy* IOMessageLoopProxy() { return io_thread_.message_loop_proxy(); diff --git a/chrome/common/worker_thread_ticker_unittest.cc b/chrome/common/worker_thread_ticker_unittest.cc index ffb0d00..9d8bde4 100644 --- a/chrome/common/worker_thread_ticker_unittest.cc +++ b/chrome/common/worker_thread_ticker_unittest.cc @@ -15,7 +15,7 @@ class TestCallback : public WorkerThreadTicker::Callback { TestCallback() : counter_(0), message_loop_(MessageLoop::current()) { } - virtual void OnTick() { + virtual void OnTick() OVERRIDE { counter_++; // Finish the test faster. @@ -31,7 +31,7 @@ class TestCallback : public WorkerThreadTicker::Callback { class LongCallback : public WorkerThreadTicker::Callback { public: - virtual void OnTick() { + virtual void OnTick() OVERRIDE { base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1500)); } }; diff --git a/chrome/nacl/nacl_ipc_adapter_unittest.cc b/chrome/nacl/nacl_ipc_adapter_unittest.cc index 404156a..0f25221 100644 --- a/chrome/nacl/nacl_ipc_adapter_unittest.cc +++ b/chrome/nacl/nacl_ipc_adapter_unittest.cc @@ -277,7 +277,7 @@ TEST_F(NaClIPCAdapterTest, ReadWithChannelError) { explicit MyThread(NaClIPCAdapter* adapter) : SimpleThread("NaClIPCAdapterThread"), adapter_(adapter) {} - virtual void Run() { + virtual void Run() OVERRIDE { base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); adapter_->OnChannelError(); } diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc index 161efd4..5f3ced4 100644 --- a/chrome/nacl/nacl_listener.cc +++ b/chrome/nacl/nacl_listener.cc @@ -110,7 +110,7 @@ class BrowserValidationDBProxy : public NaClValidationDB { : listener_(listener) { } - bool QueryKnownToValidate(const std::string& signature) { + virtual bool QueryKnownToValidate(const std::string& signature) OVERRIDE { // Initialize to false so that if the Send fails to write to the return // value we're safe. For example if the message is (for some reason) // dispatched as an async message the return parameter will not be written. @@ -123,7 +123,7 @@ class BrowserValidationDBProxy : public NaClValidationDB { return result; } - void SetKnownToValidate(const std::string& signature) { + virtual void SetKnownToValidate(const std::string& signature) OVERRIDE { // Caching is optional: NaCl will still work correctly if the IPC fails. if (!listener_->Send(new NaClProcessMsg_SetKnownToValidate(signature))) { LOG(ERROR) << "Failed to update NaCl validation cache."; diff --git a/chrome/nacl/nacl_validation_query_unittest.cc b/chrome/nacl/nacl_validation_query_unittest.cc index 8abad55..baf930d 100644 --- a/chrome/nacl/nacl_validation_query_unittest.cc +++ b/chrome/nacl/nacl_validation_query_unittest.cc @@ -39,7 +39,7 @@ class MockValidationDB : public NaClValidationDB { status_(true) { } - bool QueryKnownToValidate(const std::string& signature) { + virtual bool QueryKnownToValidate(const std::string& signature) OVERRIDE { // The typecast is needed to work around gtest trying to take the address // of a constant. EXPECT_EQ((int) NaClValidationQuery::kDigestLength, @@ -52,7 +52,7 @@ class MockValidationDB : public NaClValidationDB { return status_; } - void SetKnownToValidate(const std::string& signature) { + virtual void SetKnownToValidate(const std::string& signature) OVERRIDE { // The typecast is needed to work around gtest trying to take the address // of a constant. ASSERT_EQ((int) NaClValidationQuery::kDigestLength, @@ -93,7 +93,7 @@ class NaClValidationQueryTest : public ::testing::Test { scoped_ptr<TestQuery> query1; scoped_ptr<TestQuery> query2; - void SetUp() { + virtual void SetUp() { query1.reset(new TestQuery(kKey, kVersion)); query2.reset(new TestQuery(kKey, kVersion)); } diff --git a/chrome/renderer/benchmarking_extension.cc b/chrome/renderer/benchmarking_extension.cc index f74714f..1125550 100644 --- a/chrome/renderer/benchmarking_extension.cc +++ b/chrome/renderer/benchmarking_extension.cc @@ -80,7 +80,7 @@ class BenchmarkingWrapper : 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("CloseConnections"))) { return v8::FunctionTemplate::New(CloseConnections); } else if (name->Equals(v8::String::New("ClearCache"))) { diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index c1ab347..45b3c3e 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -75,7 +75,7 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate { virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete( webkit_glue::ResourceLoaderBridge::Peer* current_peer, ResourceType::Type resource_type, - int error_code) { + int error_code) OVERRIDE { // Update the browser about our cache. // Rate limit informing the host of our cache stats. if (!weak_factory_.HasWeakPtrs()) { @@ -98,7 +98,7 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate { virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse( webkit_glue::ResourceLoaderBridge::Peer* current_peer, const std::string& mime_type, - const GURL& url) { + const GURL& url) OVERRIDE { return ExtensionLocalizationPeer::CreateExtensionLocalizationPeer( current_peer, RenderThread::Get(), mime_type, url); } diff --git a/chrome/renderer/extensions/app_window_custom_bindings.cc b/chrome/renderer/extensions/app_window_custom_bindings.cc index cb3de93..29325d5 100644 --- a/chrome/renderer/extensions/app_window_custom_bindings.cc +++ b/chrome/renderer/extensions/app_window_custom_bindings.cc @@ -74,8 +74,9 @@ class LoadWatcher : public content::RenderViewObserver { CallbackAndDie(frame, true); } - virtual void DidFailProvisionalLoad(WebKit::WebFrame* frame, - const WebKit::WebURLError& error) { + virtual void DidFailProvisionalLoad( + WebKit::WebFrame* frame, + const WebKit::WebURLError& error) OVERRIDE { CallbackAndDie(frame, false); } diff --git a/chrome/renderer/extensions/content_watcher.cc b/chrome/renderer/extensions/content_watcher.cc index 684787a..5c2bb7e 100644 --- a/chrome/renderer/extensions/content_watcher.cc +++ b/chrome/renderer/extensions/content_watcher.cc @@ -75,7 +75,7 @@ void ContentWatcher::OnWatchPages( // selectors. struct NotifyVisitor : public content::RenderViewVisitor { explicit NotifyVisitor(ContentWatcher* watcher) : watcher_(watcher) {} - virtual bool Visit(content::RenderView* view) { + virtual bool Visit(content::RenderView* view) OVERRIDE { watcher_->NotifyBrowserOfChange(view->GetWebView()->mainFrame()); return true; // Continue visiting. } diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 180e8d8..8316c50 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -81,7 +81,7 @@ class ExtensionImpl : public ChromeV8Extension { RouteStaticFunction("MatchAgainstEventFilter", &MatchAgainstEventFilter); } - ~ExtensionImpl() {} + virtual ~ExtensionImpl() {} // Attach an event name to an object. static v8::Handle<v8::Value> AttachEvent(const v8::Arguments& args) { diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index a05b751..6ad4b1c 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -75,7 +75,7 @@ class ViewAccumulator : public content::RenderViewVisitor { std::vector<content::RenderView*> views() { return views_; } // Returns false to terminate the iteration. - virtual bool Visit(content::RenderView* render_view) { + virtual bool Visit(content::RenderView* render_view) OVERRIDE { ExtensionHelper* helper = ExtensionHelper::Get(render_view); if (!ViewTypeMatches(helper->view_type(), view_type_)) return true; diff --git a/chrome/renderer/extensions/miscellaneous_bindings.cc b/chrome/renderer/extensions/miscellaneous_bindings.cc index 9d1a742..facdec7 100644 --- a/chrome/renderer/extensions/miscellaneous_bindings.cc +++ b/chrome/renderer/extensions/miscellaneous_bindings.cc @@ -74,7 +74,7 @@ class ExtensionImpl : public extensions::ChromeV8Extension { RouteStaticFunction("BindToGC", &BindToGC); } - ~ExtensionImpl() {} + virtual ~ExtensionImpl() {} // Sends a message along the given channel. static v8::Handle<v8::Value> PostMessage(const v8::Arguments& args) { diff --git a/chrome/renderer/extensions/module_system_unittest.cc b/chrome/renderer/extensions/module_system_unittest.cc index 67baf5c..9115adb 100644 --- a/chrome/renderer/extensions/module_system_unittest.cc +++ b/chrome/renderer/extensions/module_system_unittest.cc @@ -38,7 +38,7 @@ class TestExceptionHandler : public ModuleSystem::ExceptionHandler { : handled_exception_(false) { } - virtual void HandleUncaughtException() { + virtual void HandleUncaughtException() OVERRIDE { handled_exception_ = true; } diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index 6ebfcee..b8a70bd 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -42,7 +42,7 @@ class ExternalExtensionWrapper : public v8::Extension { // Allows v8's javascript code to call the native functions defined // in this class for window.external. virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( - v8::Handle<v8::String> name); + v8::Handle<v8::String> name) OVERRIDE; // Helper function to find the RenderView. May return NULL. static RenderView* GetRenderView(); diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index b6aae4b..771f70f 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -52,7 +52,7 @@ class LoadTimesExtensionWrapper : 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("GetLoadTimes"))) { return v8::FunctionTemplate::New(GetLoadTimes); } else if (name->Equals(v8::String::New("GetCSI"))) { diff --git a/chrome/renderer/page_click_tracker_browsertest.cc b/chrome/renderer/page_click_tracker_browsertest.cc index a5aed3a..fe2a5c4 100644 --- a/chrome/renderer/page_click_tracker_browsertest.cc +++ b/chrome/renderer/page_click_tracker_browsertest.cc @@ -27,7 +27,7 @@ class TestPageClickListener : public PageClickListener { virtual bool InputElementClicked(const WebKit::WebInputElement& element, bool was_focused, - bool is_focused) { + bool is_focused) OVERRIDE { input_element_clicked_called_ = true; element_clicked_ = element; was_focused_ = was_focused; @@ -35,7 +35,7 @@ class TestPageClickListener : public PageClickListener { return notification_response_; } - virtual bool InputElementLostFocus() { + virtual bool InputElementLostFocus() OVERRIDE { input_element_lost_focus_called_ = true; return notification_response_; } diff --git a/chrome/renderer/printing/print_web_view_helper_browsertest.cc b/chrome/renderer/printing/print_web_view_helper_browsertest.cc index 5facf4f..49a22cc 100644 --- a/chrome/renderer/printing/print_web_view_helper_browsertest.cc +++ b/chrome/renderer/printing/print_web_view_helper_browsertest.cc @@ -108,7 +108,7 @@ void CreatePrintSettingsDictionary(DictionaryValue* dict) { class PrintWebViewHelperTestBase : public ChromeRenderViewTest { public: PrintWebViewHelperTestBase() {} - ~PrintWebViewHelperTestBase() {} + virtual ~PrintWebViewHelperTestBase() {} protected: // The renderer should be done calculating the number of rendered pages diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index ae654c1..c7ec5ed 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -61,7 +61,7 @@ class MockScorer : public Scorer { class PhishingClassifierDelegateTest : public content::RenderViewFakeResourcesTest { protected: - bool OnMessageReceived(const IPC::Message& message) { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PhishingClassifierDelegateTest, message) IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone, diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index db8bc11..7337259 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -197,7 +197,7 @@ class SearchBoxExtensionWrapper : public v8::Extension { // Allows v8's javascript code to call the native functions defined // in this class for window.chrome. virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( - v8::Handle<v8::String> name); + v8::Handle<v8::String> name) OVERRIDE; // Helper function to find the RenderView. May return NULL. static content::RenderView* GetRenderView(); diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index fe80cad..5eaaf7cc5 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -65,7 +65,7 @@ class TestCloudPrintURLFetcher : public CloudPrintURLFetcher { : io_message_loop_proxy_(io_message_loop_proxy) { } - virtual net::URLRequestContextGetter* GetRequestContextGetter() { + virtual net::URLRequestContextGetter* GetRequestContextGetter() OVERRIDE { return new TrackingTestURLRequestContextGetter( io_message_loop_proxy_.get(), throttler_manager()); } @@ -99,14 +99,14 @@ class CloudPrintURLFetcherTest : public testing::Test, const net::URLRequestStatus& status, int response_code, const net::ResponseCookies& cookies, - const std::string& data); + const std::string& data) OVERRIDE; - virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() { + virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() OVERRIDE { ADD_FAILURE(); return CloudPrintURLFetcher::STOP_PROCESSING; } - virtual std::string GetAuthHeader() { + virtual std::string GetAuthHeader() OVERRIDE { return std::string(); } @@ -152,18 +152,18 @@ class CloudPrintURLFetcherBasicTest : public CloudPrintURLFetcherTest { const net::URLRequestStatus& status, int response_code, const net::ResponseCookies& cookies, - const std::string& data); + const std::string& data) OVERRIDE; virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data); + const std::string& data) OVERRIDE; virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( const net::URLFetcher* source, const GURL& url, DictionaryValue* json_data, - bool succeeded); + bool succeeded) OVERRIDE; void SetHandleRawResponse(bool handle_raw_response) { handle_raw_response_ = handle_raw_response; @@ -186,7 +186,7 @@ class CloudPrintURLFetcherOverloadTest : public CloudPrintURLFetcherTest { virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data); + const std::string& data) OVERRIDE; private: int response_count_; @@ -202,9 +202,9 @@ class CloudPrintURLFetcherRetryBackoffTest : public CloudPrintURLFetcherTest { virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const net::URLFetcher* source, const GURL& url, - const std::string& data); + const std::string& data) OVERRIDE; - virtual void OnRequestGiveUp(); + virtual void OnRequestGiveUp() OVERRIDE; private: int response_count_; diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index c3c1b77..4fdde82 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -289,7 +289,8 @@ class PrinterWatcherCUPS return true; } - bool GetCurrentPrinterInfo(printing::PrinterBasicInfo* printer_info) { + virtual bool GetCurrentPrinterInfo( + printing::PrinterBasicInfo* printer_info) OVERRIDE { DCHECK(printer_info); return print_system_->GetPrinterInfo(printer_name_, printer_info); } diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 8af5ddb..309674f 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -60,7 +60,7 @@ class ServiceIOThread : public base::Thread { virtual ~ServiceIOThread(); protected: - virtual void CleanUp(); + virtual void CleanUp() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(ServiceIOThread); diff --git a/chrome/test/base/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc index a954f3b..7575f2b 100644 --- a/chrome/test/base/chrome_process_util.cc +++ b/chrome/test/base/chrome_process_util.cc @@ -43,7 +43,7 @@ class ChildProcessFilter : public base::ProcessFilter { explicit ChildProcessFilter(const std::vector<base::ProcessId>& parent_pids) : parent_pids_(parent_pids.begin(), parent_pids.end()) {} - virtual bool Includes(const base::ProcessEntry& entry) const { + virtual bool Includes(const base::ProcessEntry& entry) const OVERRIDE { return parent_pids_.find(entry.parent_pid()) != parent_pids_.end(); } diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc index 2f6897f..bfa84c9 100644 --- a/chrome/test/base/chrome_test_launcher.cc +++ b/chrome/test/base/chrome_test_launcher.cc @@ -85,7 +85,7 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { #endif } - virtual void PostRunMessageLoop() { + virtual void PostRunMessageLoop() OVERRIDE { #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { DCHECK_EQ(handlers_.empty(), false); diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index 73e861a..a54e30e 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -90,7 +90,7 @@ class LocalHostResolverProc : public net::HostResolverProc { net::AddressFamily address_family, net::HostResolverFlags host_resolver_flags, net::AddressList* addrlist, - int* os_error) { + int* os_error) OVERRIDE { const char* kLocalHostNames[] = {"localhost", "127.0.0.1", "::1"}; bool local = false; diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc index 78464d9..9eef4da 100644 --- a/chrome/test/base/module_system_test.cc +++ b/chrome/test/base/module_system_test.cc @@ -57,13 +57,13 @@ class StringSourceMap : public ModuleSystem::SourceMap { StringSourceMap() {} virtual ~StringSourceMap() {} - v8::Handle<v8::Value> GetSource(const std::string& name) OVERRIDE { + virtual v8::Handle<v8::Value> GetSource(const std::string& name) OVERRIDE { if (source_map_.count(name) == 0) return v8::Undefined(); return v8::String::New(source_map_[name].c_str()); } - bool Contains(const std::string& name) OVERRIDE { + virtual bool Contains(const std::string& name) OVERRIDE { return source_map_.count(name); } @@ -78,7 +78,7 @@ class StringSourceMap : public ModuleSystem::SourceMap { class FailsOnException : public ModuleSystem::ExceptionHandler { public: - virtual void HandleUncaughtException() { + virtual void HandleUncaughtException() OVERRIDE { FAIL(); } }; diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index e9800b7..52c1dae0 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -92,16 +92,16 @@ class QuittingHistoryDBTask : public HistoryDBTask { QuittingHistoryDBTask() {} virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) { + history::HistoryDatabase* db) OVERRIDE { return true; } - virtual void DoneRunOnMainThread() { + virtual void DoneRunOnMainThread() OVERRIDE { MessageLoop::current()->Quit(); } private: - ~QuittingHistoryDBTask() {} + virtual ~QuittingHistoryDBTask() {} DISALLOW_COPY_AND_ASSIGN(QuittingHistoryDBTask); }; @@ -121,7 +121,7 @@ class TestExtensionURLRequestContext : public net::URLRequestContext { class TestExtensionURLRequestContextGetter : public net::URLRequestContextGetter { public: - virtual net::URLRequestContext* GetURLRequestContext() { + virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE { if (!context_.get()) context_.reset(new TestExtensionURLRequestContext()); return context_.get(); diff --git a/chrome/test/base/ui_controls_aurax11.cc b/chrome/test/base/ui_controls_aurax11.cc index 1f2b52a..c643650 100644 --- a/chrome/test/base/ui_controls_aurax11.cc +++ b/chrome/test/base/ui_controls_aurax11.cc @@ -87,18 +87,19 @@ class UIControlsX11 : public UIControlsAura { bool control, bool shift, bool alt, - bool command) { + bool command) OVERRIDE { DCHECK(!command); // No command key on Aura return SendKeyPressNotifyWhenDone( window, key, control, shift, alt, command, base::Closure()); } - virtual bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, - ui::KeyboardCode key, - bool control, - bool shift, - bool alt, - bool command, - const base::Closure& closure) { + virtual bool SendKeyPressNotifyWhenDone( + gfx::NativeWindow window, + ui::KeyboardCode key, + bool control, + bool shift, + bool alt, + bool command, + const base::Closure& closure) OVERRIDE { DCHECK(!command); // No command key on Aura XEvent xevent = {0}; xevent.xkey.type = KeyPress; @@ -128,12 +129,13 @@ class UIControlsX11 : public UIControlsAura { } // Simulate a mouse move. (x,y) are absolute screen coordinates. - virtual bool SendMouseMove(long x, long y) { + virtual bool SendMouseMove(long x, long y) OVERRIDE { return SendMouseMoveNotifyWhenDone(x, y, base::Closure()); } - virtual bool SendMouseMoveNotifyWhenDone(long x, - long y, - const base::Closure& closure) { + virtual bool SendMouseMoveNotifyWhenDone( + long x, + long y, + const base::Closure& closure) OVERRIDE { XEvent xevent = {0}; XMotionEvent* xmotion = &xevent.xmotion; xmotion->type = MotionNotify; @@ -149,12 +151,13 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseEvents(MouseButton type, int state) { + virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE { return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); } - virtual bool SendMouseEventsNotifyWhenDone(MouseButton type, - int state, - const base::Closure& closure) { + virtual bool SendMouseEventsNotifyWhenDone( + MouseButton type, + int state, + const base::Closure& closure) OVERRIDE { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; DCHECK_NE(g_current_x, -1000); @@ -190,10 +193,11 @@ class UIControlsX11 : public UIControlsAura { RunClosureAfterAllPendingUIEvents(closure); return true; } - virtual bool SendMouseClick(MouseButton type) { + virtual bool SendMouseClick(MouseButton type) OVERRIDE { return SendMouseEvents(type, UP | DOWN); } - virtual void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { + virtual void RunClosureAfterAllPendingUIEvents( + const base::Closure& closure) OVERRIDE { if (closure.is_null()) return; static XEvent* marker_event = NULL; diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 79de29a..af6ede2 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -113,7 +113,7 @@ class FindInPageNotificationObserver : public content::NotificationObserver { gfx::Rect selection_rect() const { return selection_rect_; } virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) { + const content::NotificationDetails& details) OVERRIDE { if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) { content::Details<FindNotificationDetails> find_details(details); if (find_details->request_id() == current_find_request_id_) { diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 0ca6e07..b7ad99a 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -42,13 +42,13 @@ class TestView : public views::View { PreferredSizeChanged(); } - gfx::Size GetPreferredSize() { + virtual gfx::Size GetPreferredSize() OVERRIDE { if (!preferred_size_.IsEmpty()) return preferred_size_; return View::GetPreferredSize(); } - virtual void Layout() { + virtual void Layout() OVERRIDE { View* child_view = child_at(0); child_view->SetBounds(0, 0, width(), height()); } diff --git a/chrome/test/base/web_ui_browsertest.cc b/chrome/test/base/web_ui_browsertest.cc index 5936006..5773dba 100644 --- a/chrome/test/base/web_ui_browsertest.cc +++ b/chrome/test/base/web_ui_browsertest.cc @@ -288,7 +288,7 @@ class MockWebUIDataSource : public content::URLDataSource { callback.Run(response); } - std::string GetMimeType(const std::string& path) const OVERRIDE { + virtual std::string GetMimeType(const std::string& path) const OVERRIDE { return "text/html"; } @@ -303,7 +303,8 @@ class MockWebUIProvider MockWebUIProvider() {} // Returns a new WebUI - WebUIController* NewWebUI(content::WebUI* web_ui, const GURL& url) OVERRIDE { + virtual WebUIController* NewWebUI(content::WebUI* web_ui, + const GURL& url) OVERRIDE { WebUIController* controller = new content::WebUIController(web_ui); Profile* profile = Profile::FromWebUI(web_ui); content::URLDataSource::Add(profile, new MockWebUIDataSource()); diff --git a/chrome/test/chromedriver/net/net_util.cc b/chrome/test/chromedriver/net/net_util.cc index c6aebc3..bf3d2ca 100644 --- a/chrome/test/chromedriver/net/net_util.cc +++ b/chrome/test/chromedriver/net/net_util.cc @@ -29,7 +29,7 @@ class SyncUrlFetcher : public net::URLFetcherDelegate { return success_; } - virtual void OnURLFetchComplete(const net::URLFetcher* source) { + virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { success_ = (source->GetResponseCode() == 200); if (success_) success_ = source->GetResponseAsString(response_); diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index cd0e166..5430107 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -55,7 +55,7 @@ class GpuFeatureTest : public InProcessBrowserTest { gpu_test_dir_ = test_dir.AppendASCII("gpu"); } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // Do not use mesa if real GPU is required. if (!command_line->HasSwitch(switches::kUseGpuInTests)) { #if !defined(OS_MACOSX) @@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest, class AcceleratedCompositingTest : public GpuFeatureTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuFeatureTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); } @@ -290,7 +290,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { class WebGLTest : public GpuFeatureTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuFeatureTest::SetUpCommandLine(command_line); #if !defined(OS_ANDROID) // On Android, WebGL is disabled by default @@ -357,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingBlocked) { class WebGLMultisamplingTest : public GpuFeatureTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuFeatureTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableGLMultisampling); } @@ -411,7 +411,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) { class Canvas2DDisabledTest : public GpuFeatureTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuFeatureTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); } @@ -435,7 +435,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) { class ThreadedCompositorTest : public GpuFeatureTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuFeatureTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableThreadedCompositing); } diff --git a/chrome/test/security_tests/sandbox_browsertest.cc b/chrome/test/security_tests/sandbox_browsertest.cc index bf76c29..8b09a95 100644 --- a/chrome/test/security_tests/sandbox_browsertest.cc +++ b/chrome/test/security_tests/sandbox_browsertest.cc @@ -12,7 +12,7 @@ class SandboxTest : public InProcessBrowserTest { protected: SandboxTest() : InProcessBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitchASCII(switches::kTestSandbox, "security_tests.dll"); } diff --git a/chrome/tools/ipclist/ipcfuzz.cc b/chrome/tools/ipclist/ipcfuzz.cc index 5006307..3387402 100644 --- a/chrome/tools/ipclist/ipcfuzz.cc +++ b/chrome/tools/ipclist/ipcfuzz.cc @@ -125,75 +125,75 @@ class DefaultFuzzer : public IPC::Fuzzer { virtual ~DefaultFuzzer() {} - virtual bool FuzzThisMessage(const IPC::Message *msg) { + virtual bool FuzzThisMessage(const IPC::Message *msg) OVERRIDE { return (message_set_.empty() || std::find(message_set_.begin(), message_set_.end(), msg->type()) != message_set_.end()); } - virtual void FuzzBool(bool* value) { + virtual void FuzzBool(bool* value) OVERRIDE { if (rand() % frequency_ == 0) (*value) = !(*value); } - virtual void FuzzInt(int* value) { + virtual void FuzzInt(int* value) OVERRIDE { FuzzIntegralType<int>(value, frequency_); } - virtual void FuzzLong(long* value) { + virtual void FuzzLong(long* value) OVERRIDE { FuzzIntegralType<long>(value, frequency_); } - virtual void FuzzSize(size_t* value) { + virtual void FuzzSize(size_t* value) OVERRIDE { FuzzIntegralType<size_t>(value, frequency_); } - virtual void FuzzUChar(unsigned char* value) { + virtual void FuzzUChar(unsigned char* value) OVERRIDE { FuzzIntegralType<unsigned char>(value, frequency_); } - virtual void FuzzUInt16(uint16* value) { + virtual void FuzzUInt16(uint16* value) OVERRIDE { FuzzIntegralType<uint16>(value, frequency_); } - virtual void FuzzUInt32(uint32* value) { + virtual void FuzzUInt32(uint32* value) OVERRIDE { FuzzIntegralType<uint32>(value, frequency_); } - virtual void FuzzInt64(int64* value) { + virtual void FuzzInt64(int64* value) OVERRIDE { FuzzIntegralType<int64>(value, frequency_); } - virtual void FuzzUInt64(uint64* value) { + virtual void FuzzUInt64(uint64* value) OVERRIDE { FuzzIntegralType<uint64>(value, frequency_); } - virtual void FuzzFloat(float* value) { + virtual void FuzzFloat(float* value) OVERRIDE { if (rand() % frequency_ == 0) (*value) *= rand() / 1000000.0; } - virtual void FuzzDouble(double* value) { + virtual void FuzzDouble(double* value) OVERRIDE { if (rand() % frequency_ == 0) (*value) *= rand() / 1000000.0; } - virtual void FuzzString(std::string* value) { + virtual void FuzzString(std::string* value) OVERRIDE { FuzzStringType<std::string>(value, frequency_, "BORKED", ""); } - virtual void FuzzWString(std::wstring* value) { + virtual void FuzzWString(std::wstring* value) OVERRIDE { FuzzStringType<std::wstring>(value, frequency_, L"BORKED", L""); } - virtual void FuzzString16(string16* value) { + virtual void FuzzString16(string16* value) OVERRIDE { FuzzStringType<string16>(value, frequency_, WideToUTF16(L"BORKED"), WideToUTF16(L"")); } - virtual void FuzzData(char* data, int length) { + virtual void FuzzData(char* data, int length) OVERRIDE { if (rand() % frequency_ == 0) { for (int i = 0; i < length; ++i) { FuzzIntegralType<char>(&data[i], frequency_); @@ -201,7 +201,7 @@ class DefaultFuzzer : public IPC::Fuzzer { } } - virtual void FuzzBytes(void* data, int data_len) { + virtual void FuzzBytes(void* data, int data_len) OVERRIDE { FuzzData(static_cast<char*>(data), data_len); } @@ -218,26 +218,26 @@ class NoOpFuzzer : public IPC::Fuzzer { NoOpFuzzer() {} virtual ~NoOpFuzzer() {} - virtual bool FuzzThisMessage(const IPC::Message *msg) { + virtual bool FuzzThisMessage(const IPC::Message *msg) OVERRIDE { return true; } - virtual void FuzzBool(bool* value) {} - virtual void FuzzInt(int* value) {} - virtual void FuzzLong(long* value) {} - virtual void FuzzSize(size_t* value) {} - virtual void FuzzUChar(unsigned char* value) {} - virtual void FuzzUInt16(uint16* value) {} - virtual void FuzzUInt32(uint32* value) {} - virtual void FuzzInt64(int64* value) {} - virtual void FuzzUInt64(uint64* value) {} - virtual void FuzzFloat(float* value) {} - virtual void FuzzDouble(double* value) {} - virtual void FuzzString(std::string* value) {} - virtual void FuzzWString(std::wstring* value) {} - virtual void FuzzString16(string16* value) {} - virtual void FuzzData(char* data, int length) {} - virtual void FuzzBytes(void* data, int data_len) {} + virtual void FuzzBool(bool* value) OVERRIDE {} + virtual void FuzzInt(int* value) OVERRIDE {} + virtual void FuzzLong(long* value) OVERRIDE {} + virtual void FuzzSize(size_t* value) OVERRIDE {} + virtual void FuzzUChar(unsigned char* value) OVERRIDE {} + virtual void FuzzUInt16(uint16* value) OVERRIDE {} + virtual void FuzzUInt32(uint32* value) OVERRIDE {} + virtual void FuzzInt64(int64* value) OVERRIDE {} + virtual void FuzzUInt64(uint64* value) OVERRIDE {} + virtual void FuzzFloat(float* value) OVERRIDE {} + virtual void FuzzDouble(double* value) OVERRIDE {} + virtual void FuzzString(std::string* value) OVERRIDE {} + virtual void FuzzWString(std::wstring* value) OVERRIDE {} + virtual void FuzzString16(string16* value) OVERRIDE {} + virtual void FuzzData(char* data, int length) OVERRIDE {} + virtual void FuzzBytes(void* data, int data_len) OVERRIDE {} }; class FuzzerFactory { @@ -661,7 +661,7 @@ class ipcfuzz : public IPC::ChannelProxy::OutgoingMessageFilter { PopulateFuzzFunctionMap(&fuzz_function_map_); } - IPC::Message* Rewrite(IPC::Message* message) { + virtual IPC::Message* Rewrite(IPC::Message* message) OVERRIDE { if (fuzzer_ && fuzzer_->FuzzThisMessage(message)) { FuzzFunctionMap::iterator it = fuzz_function_map_.find(message->type()); if (it != fuzz_function_map_.end()) { |