Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Linux/ChromeOS Chromium style checker cleanup, chrome/browser 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://codereview.chromium.org/12212048

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser@181164 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 27c4519a45997806c8426dd2ac1b6f5001e8c716 1 parent b53cb07
rsleevi@chromium.org authored
Showing with 527 additions and 466 deletions.
  1. +2 −2 autocomplete/autocomplete_provider_unittest.cc
  2. +1 −1  autocomplete/history_contents_provider_unittest.cc
  3. +2 −2 autocomplete/history_quick_provider_unittest.cc
  4. +2 −2 autocomplete/shortcuts_provider_unittest.cc
  5. +4 −1 autofill/autocomplete_history_manager_unittest.cc
  6. +1 −1  autofill/autofill_browsertest.cc
  7. +1 −1  autofill/autofill_metrics_unittest.cc
  8. +4 −4 background/background_contents_service_unittest.cc
  9. +2 −2 background/background_mode_manager_unittest.cc
  10. +1 −1  bookmarks/bookmark_html_writer_unittest.cc
  11. +1 −1  bookmarks/bookmark_model_unittest.cc
  12. +1 −1  browser_keyevents_browsertest.cc
  13. +2 −2 browsing_data/browsing_data_remover_unittest.cc
  14. +3 −3 captive_portal/captive_portal_browsertest.cc
  15. +3 −3 captive_portal/captive_portal_service_unittest.cc
  16. +1 −1  chrome_browser_main.cc
  17. +1 −1  chrome_browser_main_posix.cc
  18. +1 −1  chrome_switches_browsertest.cc
  19. +2 −2 component_updater/test/component_updater_service_unittest.cc
  20. +2 −2 content_settings/content_settings_default_provider.cc
  21. +1 −1  content_settings/content_settings_default_provider_unittest.cc
  22. +1 −1  content_settings/content_settings_pref_provider_unittest.cc
  23. +2 −2 content_settings/content_settings_rule_unittest.cc
  24. +3 −3 custom_handlers/protocol_handler_registry_browsertest.cc
  25. +16 −14 custom_handlers/protocol_handler_registry_unittest.cc
  26. +5 −3 devtools/devtools_file_helper.cc
  27. +5 −5 devtools/devtools_sanity_browsertest.cc
  28. +10 −8 diagnostics/diagnostics_main.cc
  29. +5 −5 diagnostics/diagnostics_model.cc
  30. +7 −4 diagnostics/diagnostics_model_unittest.cc
  31. +14 −14 diagnostics/recon_diagnostics.cc
  32. +2 −2 diagnostics/sqlite_diagnostics.cc
  33. +23 −13 download/download_browsertest.cc
  34. +2 −2 download/download_request_infobar_delegate_unittest.cc
  35. +1 −1  download/download_request_limiter_unittest.cc
  36. +6 −6 download/save_page_browsertest.cc
  37. +1 −1  errorpage_browsertest.cc
  38. +1 −1  external_extension_browsertest.cc
  39. +6 −6 external_protocol/external_protocol_handler_unittest.cc
  40. +1 −1  fast_shutdown_browsertest.cc
  41. +4 −4 favicon/favicon_handler_unittest.cc
  42. +1 −1  feedback/feedback_util.cc
  43. +1 −1  first_run/first_run.cc
  44. +2 −2 fullscreen_gtk.cc
  45. +1 −1  geolocation/chrome_geolocation_permission_context_unittest.cc
  46. +4 −4 geolocation/geolocation_browsertest.cc
  47. +1 −1  geolocation/geolocation_infobar_queue_controller_unittest.cc
  48. +1 −1  google/google_url_tracker_unittest.cc
  49. +1 −1  gpu/chrome_gpu_util.cc
  50. +2 −2 history/expire_history_backend.cc
  51. +5 −4 history/expire_history_backend_unittest.cc
  52. +2 −2 history/history_browsertest.cc
  53. +5 −4 history/history_unittest.cc
  54. +1 −1  history/in_memory_url_index_unittest.cc
  55. +3 −2 history/multipart_browsertest.cc
  56. +1 −1  history/scored_history_match_unittest.cc
  57. +2 −2 history/shortcuts_backend_unittest.cc
  58. +2 −2 history/shortcuts_database_unittest.cc
  59. +4 −4 history/text_database_manager_unittest.cc
  60. +1 −1  history/text_database_unittest.cc
  61. +2 −2 history/thumbnail_database_unittest.cc
  62. +2 −2 history/top_sites.cc
  63. +4 −3 history/top_sites_unittest.cc
  64. +3 −3 history/url_database_unittest.cc
  65. +3 −3 history/visit_database_unittest.cc
  66. +2 −2 history/visit_filter_unittest.cc
  67. +17 −15 importer/firefox_importer_unittest.cc
  68. +1 −1  importer/firefox_importer_utils.cc
  69. +1 −1  infobars/infobars_browsertest.cc
  70. +1 −1  instant/instant_loader.cc
  71. +1 −1  intents/native_services_browsertest.cc
  72. +1 −1  intents/web_intents_registry.cc
  73. +1 −1  io_thread.cc
  74. +5 −5 jankometer.cc
  75. +1 −1  logging_chrome_browsertest.cc
  76. +3 −3 media/chrome_webrtc_browsertest.cc
  77. +1 −1  media_gallery/media_file_system_registry.cc
  78. +3 −3 media_gallery/media_gallery_database_unittest.cc
  79. +2 −2 metrics/metrics_service.cc
  80. +2 −2 metrics/thread_watcher.cc
  81. +6 −6 metrics/thread_watcher_unittest.cc
  82. +1 −1  metrics/variations/resource_request_allowed_notifier_unittest.cc
  83. +1 −1  nacl_host/nacl_process_host.cc
  84. +1 −1  nacl_host/nacl_validation_cache_unittest.cc
  85. +1 −1  nacl_host/test/gdb_debug_stub_browsertest.cc
  86. +1 −1  nacl_host/test/nacl_gdb_browsertest.cc
  87. +1 −1  net/chrome_fraudulent_certificate_reporter_unittest.cc
  88. +3 −3 net/chrome_net_log_unittest.cc
  89. +3 −2 net/connection_tester.cc
  90. +4 −4 net/connection_tester_unittest.cc
  91. +5 −3 net/pref_proxy_config_tracker_impl_unittest.cc
  92. +2 −2 net/ssl_config_service_manager_pref.cc
  93. +1 −1  net/transport_security_persister_unittest.cc
  94. +1 −1  page_cycler/page_cycler_browsertest.cc
  95. +28 −20 password_manager/password_store_x_unittest.cc
  96. +3 −3 performance_monitor/database_unittest.cc
  97. +1 −1  policy/config_dir_policy_loader_unittest.cc
  98. +1 −1  policy/device_management_service_browsertest.cc
  99. +1 −1  policy/device_status_collector_browsertest.cc
  100. +1 −1  policy/proxy_policy_provider_unittest.cc
  101. +3 −3 predictors/autocomplete_action_predictor_unittest.cc
  102. +3 −3 predictors/resource_prefetch_predictor_unittest.cc
  103. +1 −1  predictors/resource_prefetcher_unittest.cc
  104. +1 −1  prefs/pref_service.cc
  105. +1 −1  prefs/scoped_user_pref_update_unittest.cc
  106. +1 −1  prerender/prerender_browsertest.cc
  107. +1 −1  prerender/prerender_unittest.cc
  108. +1 −1  printing/cloud_print/cloud_print_proxy_service_unittest.cc
  109. +8 −4 printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
  110. +3 −3 printing/print_dialog_cloud_interative_uitest.cc
  111. +9 −8 printing/print_job_unittest.cc
  112. +1 −1  printing/print_preview_dialog_controller_browsertest.cc
  113. +3 −3 process_singleton_browsertest.cc
  114. +5 −5 process_singleton_linux.cc
  115. +1 −1  profiles/off_the_record_profile_impl.cc
  116. +2 −2 profiles/profile_dependency_manager_unittest.cc
  117. +1 −1  profiles/profile_io_data.cc
  118. +2 −2 safe_browsing/malware_details.cc
  119. +2 −1  safe_browsing/malware_details_unittest.cc
  120. +3 −2 safe_browsing/safe_browsing_blocking_page.cc
  121. +5 −4 safe_browsing/safe_browsing_blocking_page_test.cc
  122. +5 −3 safe_browsing/safe_browsing_blocking_page_unittest.cc
  123. +1 −1  safe_browsing/safe_browsing_database.cc
  124. +1 −1  safe_browsing/safe_browsing_service.cc
  125. +24 −21 safe_browsing/safe_browsing_service_browsertest.cc
  126. +1 −1  safe_browsing/safe_browsing_test.cc
  127. +1 −1  search_engines/search_provider_install_data.cc
  128. +2 −2 search_engines/template_url_fetcher.cc
  129. +2 −2 search_engines/template_url_parser_unittest.cc
  130. +1 −1  search_engines/template_url_service_test_util.cc
  131. +1 −1  service/service_process_control_browsertest.cc
  132. +1 −1  sessions/better_session_restore_browsertest.cc
  133. +2 −2 sessions/persistent_tab_restore_service_browsertest.cc
  134. +2 −2 sessions/session_restore.cc
  135. +3 −3 sessions/session_service_unittest.cc
  136. +4 −3 shell_integration_unittest.cc
  137. +1 −1  signin/signin_global_error_unittest.cc
  138. +3 −2 speech/speech_recognition_bubble_browsertest.cc
  139. +9 −8 speech/speech_recognition_bubble_controller_unittest.cc
  140. +9 −9 speech/tts_controller_unittest.cc
  141. +3 −3 speech/tts_extension_loader_chromeos.cc
  142. +5 −5 speech/tts_linux.cc
  143. +2 −2 spellchecker/spellcheck_custom_dictionary_unittest.cc
  144. +2 −2 spellchecker/spellcheck_service_unittest.cc
  145. +2 −2 spellchecker/spelling_service_client_unittest.cc
  146. +3 −3 ssl/ssl_browser_tests.cc
  147. +1 −1  ssl/ssl_tab_helper.cc
  148. +2 −1  sync/glue/app_notification_data_type_controller_unittest.cc
  149. +8 −7 sync/glue/frontend_data_type_controller_unittest.cc
  150. +2 −2 sync/glue/history_model_worker.cc
  151. +6 −5 sync/glue/non_frontend_data_type_controller_unittest.cc
  152. +3 −3 sync/glue/session_model_associator_unittest.cc
  153. +3 −3 sync/glue/synced_device_tracker_unittest.cc
  154. +1 −1  sync/glue/typed_url_model_associator_unittest.cc
  155. +1 −1  sync/profile_sync_service_autofill_unittest.cc
  156. +1 −1  sync/profile_sync_service_bookmark_unittest.cc
  157. +2 −2 sync/profile_sync_service_preference_unittest.cc
  158. +2 −2 sync/profile_sync_service_session_unittest.cc
  159. +1 −1  sync/profile_sync_service_startup_unittest.cc
  160. +1 −1  sync/profile_sync_service_typed_url_unittest.cc
  161. +3 −3 sync_file_system/local_file_sync_service_unittest.cc
  162. +1 −1  sync_file_system/sync_file_system_service_unittest.cc
  163. +1 −1  system_monitor/removable_device_notifications_linux_unittest.cc
  164. +1 −1  system_monitor/removable_storage_notifications_unittest.cc
  165. +6 −6 task_manager/task_manager_unittest.cc
  166. +1 −1  themes/theme_service_unittest.cc
  167. +1 −1  themes/theme_syncable_service_unittest.cc
  168. +4 −4 translate/translate_manager_browsertest.cc
  169. +1 −1  unload_browsertest.cc
  170. +1 −1  usb/usb_service.cc
  171. +1 −1  web_resource/json_asynchronous_unpacker.cc
  172. +10 −7 webdata/web_data_service_unittest.cc
View
4 autocomplete/autocomplete_provider_unittest.cc
@@ -52,7 +52,7 @@ class TestProvider : public AutocompleteProvider {
}
virtual void Start(const AutocompleteInput& input,
- bool minimal_changes);
+ bool minimal_changes) OVERRIDE;
void set_listener(AutocompleteProviderListener* listener) {
listener_ = listener;
@@ -192,7 +192,7 @@ class AutocompleteProviderTest : public testing::Test,
// content::NotificationObserver
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
MessageLoopForUI message_loop_;
content::NotificationRegistrar registrar_;
View
2  autocomplete/history_contents_provider_unittest.cc
@@ -116,7 +116,7 @@ class HistoryContentsProviderTest : public testing::Test,
class HistoryContentsProviderBodyOnlyTest : public HistoryContentsProviderTest {
protected:
- virtual bool BodyOnly() { return true; }
+ virtual bool BodyOnly() OVERRIDE { return true; }
};
TEST_F(HistoryContentsProviderTest, Body) {
View
4 autocomplete/history_quick_provider_unittest.cc
@@ -104,8 +104,8 @@ class HistoryQuickProviderTest : public testing::Test,
std::set<std::string> matches_;
};
- void SetUp();
- void TearDown();
+ virtual void SetUp();
+ virtual void TearDown();
virtual void GetTestData(size_t* data_count, TestURLInfo** test_data);
View
4 autocomplete/shortcuts_provider_unittest.cc
@@ -142,8 +142,8 @@ class ShortcutsProviderTest : public testing::Test,
std::set<std::string> matches_;
};
- void SetUp();
- void TearDown();
+ virtual void SetUp();
+ virtual void TearDown();
// Fills test data into the provider.
void FillData(TestShortcutInfo* db, size_t db_size);
View
5 autofill/autocomplete_history_manager_unittest.cc
@@ -179,7 +179,10 @@ class AutocompleteHistoryManagerStubSend : public AutocompleteHistoryManager {
: AutocompleteHistoryManager(web_contents, profile, wds.Pass()) {}
// Intentionally swallow the message.
- virtual bool Send(IPC::Message* message) { delete message; return true; }
+ virtual bool Send(IPC::Message* message) OVERRIDE {
+ delete message;
+ return true;
+ }
};
} // namespace
View
2  autofill/autofill_browsertest.cc
@@ -96,7 +96,7 @@ class WindowedPersonalDataManagerObserver
content::NotificationService::AllSources());
}
- ~WindowedPersonalDataManagerObserver() {
+ virtual ~WindowedPersonalDataManagerObserver() {
if (!infobar_service_)
return;
View
2  autofill/autofill_metrics_unittest.cc
@@ -190,7 +190,7 @@ class TestAutofillManager : public AutofillManager {
set_metric_logger(new MockAutofillMetrics);
}
- virtual bool IsAutofillEnabled() const { return autofill_enabled_; }
+ virtual bool IsAutofillEnabled() const OVERRIDE { return autofill_enabled_; }
void set_autofill_enabled(bool autofill_enabled) {
autofill_enabled_ = autofill_enabled;
View
8 background/background_contents_service_unittest.cc
@@ -26,8 +26,8 @@
class BackgroundContentsServiceTest : public testing::Test {
public:
BackgroundContentsServiceTest() {}
- ~BackgroundContentsServiceTest() {}
- void SetUp() {
+ virtual ~BackgroundContentsServiceTest() {}
+ virtual void SetUp() {
command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
}
@@ -75,7 +75,7 @@ class MockBackgroundContents : public BackgroundContents {
content::Source<Profile>(profile_),
content::Details<BackgroundContents>(this));
}
- virtual const GURL& GetURL() const { return url_; }
+ virtual const GURL& GetURL() const OVERRIDE { return url_; }
void MockClose(Profile* profile) {
content::NotificationService::current()->Notify(
@@ -85,7 +85,7 @@ class MockBackgroundContents : public BackgroundContents {
delete this;
}
- ~MockBackgroundContents() {
+ virtual ~MockBackgroundContents() {
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
content::Source<Profile>(profile_),
View
4 background/background_mode_manager_unittest.cc
@@ -20,8 +20,8 @@ class BackgroundModeManagerTest : public testing::Test {
public:
BackgroundModeManagerTest()
: profile_manager_(TestingBrowserProcess::GetGlobal()) {}
- ~BackgroundModeManagerTest() {}
- void SetUp() {
+ virtual ~BackgroundModeManagerTest() {}
+ virtual void SetUp() {
command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
ASSERT_TRUE(profile_manager_.SetUp());
}
View
2  bookmarks/bookmark_html_writer_unittest.cc
@@ -129,7 +129,7 @@ class BookmarksObserver : public BookmarksExportObserver {
DCHECK(loop);
}
- virtual void OnExportFinished() {
+ virtual void OnExportFinished() OVERRIDE {
loop_->Quit();
}
View
2  bookmarks/bookmark_model_unittest.cc
@@ -150,7 +150,7 @@ class BookmarkModelTest : public testing::Test,
ClearCounts();
}
- void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {
+ virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {
// We never load from the db, so that this should never get invoked.
NOTREACHED();
}
View
2  browser_keyevents_browsertest.cc
@@ -108,7 +108,7 @@ class TestFinishObserver : public content::NotificationObserver {
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
DCHECK(type == content::NOTIFICATION_DOM_OPERATION_RESPONSE);
content::Details<DomOperationNotificationDetails> dom_op_details(details);
// We might receive responses for other script execution, but we only
View
4 browsing_data/browsing_data_remover_unittest.cc
@@ -149,7 +149,7 @@ class AwaitCompletionHelper : public BrowsingDataRemover::Observer {
protected:
// BrowsingDataRemover::Observer implementation.
- virtual void OnBrowsingDataRemoverDone() {
+ virtual void OnBrowsingDataRemoverDone() OVERRIDE {
Notify();
}
@@ -515,7 +515,7 @@ class BrowsingDataRemoverTest : public testing::Test,
virtual ~BrowsingDataRemoverTest() {
}
- void TearDown() {
+ virtual void TearDown() {
// TestingProfile contains a DOMStorageContext. BrowserContext's destructor
// posts a message to the WEBKIT thread to delete some of its member
// variables. We need to ensure that the profile is destroyed, and that
View
6 captive_portal/captive_portal_browsertest.cc
@@ -691,9 +691,9 @@ class CaptivePortalObserver : public content::NotificationObserver {
private:
// Records results and exits the message loop, if needed.
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
// Number of times OnPortalResult has been called since construction.
int num_results_received_;
View
6 captive_portal/captive_portal_service_unittest.cc
@@ -51,9 +51,9 @@ class CaptivePortalObserver : public content::NotificationObserver {
int num_results_received() const { return num_results_received_; }
private:
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE {
ASSERT_EQ(type, chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT);
ASSERT_EQ(profile_, content::Source<Profile>(source).ptr());
View
2  chrome_browser_main.cc
@@ -566,7 +566,7 @@ class LoadCompleteListener : public content::NotificationObserver {
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
startup_metric_utils::OnInitialPageLoadComplete();
delete this;
View
2  chrome_browser_main_posix.cc
@@ -155,7 +155,7 @@ class ShutdownDetector : public base::PlatformThread::Delegate {
public:
explicit ShutdownDetector(int shutdown_fd);
- virtual void ThreadMain();
+ virtual void ThreadMain() OVERRIDE;
private:
const int shutdown_fd_;
View
2  chrome_switches_browsertest.cc
@@ -16,7 +16,7 @@ class HostRulesTest : public InProcessBrowserTest {
protected:
HostRulesTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
ASSERT_TRUE(test_server()->Start());
// Map all hosts to our local server.
View
4 component_updater/test/component_updater_service_unittest.cc
@@ -170,11 +170,11 @@ class ComponentUpdaterTest : public testing::Test {
net::URLFetcher::SetEnableInterceptionForTests(true);
}
- ~ComponentUpdaterTest() {
+ virtual ~ComponentUpdaterTest() {
net::URLFetcher::SetEnableInterceptionForTests(false);
}
- void TearDown() {
+ virtual void TearDown() {
xmlCleanupGlobals();
}
View
4 content_settings/content_settings_default_provider.cc
@@ -69,11 +69,11 @@ class DefaultRuleIterator : public RuleIterator {
value_.reset(value->DeepCopy());
}
- bool HasNext() const {
+ virtual bool HasNext() const OVERRIDE {
return value_.get() != NULL;
}
- Rule Next() {
+ virtual Rule Next() OVERRIDE {
DCHECK(value_.get());
return Rule(ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::Wildcard(),
View
2  content_settings/content_settings_default_provider_unittest.cc
@@ -24,7 +24,7 @@ class DefaultProviderTest : public testing::Test {
: ui_thread_(BrowserThread::UI, &message_loop_),
provider_(profile_.GetPrefs(), false) {
}
- ~DefaultProviderTest() {
+ virtual ~DefaultProviderTest() {
provider_.ShutdownOnUIThread();
}
View
2  content_settings/content_settings_pref_provider_unittest.cc
@@ -39,7 +39,7 @@ class DeadlockCheckerThread : public base::PlatformThread::Delegate {
explicit DeadlockCheckerThread(PrefProvider* provider)
: provider_(provider) {}
- virtual void ThreadMain() {
+ virtual void ThreadMain() OVERRIDE {
bool got_lock = provider_->lock_.Try();
EXPECT_TRUE(got_lock);
if (got_lock)
View
4 content_settings/content_settings_rule_unittest.cc
@@ -19,11 +19,11 @@ class ListIterator : public RuleIterator {
virtual ~ListIterator() {}
- virtual bool HasNext() const {
+ virtual bool HasNext() const OVERRIDE {
return !rules_.empty();
}
- virtual Rule Next() {
+ virtual Rule Next() OVERRIDE {
EXPECT_FALSE(rules_.empty());
// |front()| returns a reference but we're going to discard the object
// referred to; force copying here.
View
6 custom_handlers/protocol_handler_registry_browsertest.cc
@@ -28,11 +28,11 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
content::ContextMenuParams params)
: RenderViewContextMenu(web_contents, params) { }
- virtual void PlatformInit() { }
- virtual void PlatformCancel() { }
+ virtual void PlatformInit() OVERRIDE { }
+ virtual void PlatformCancel() OVERRIDE { }
virtual bool GetAcceleratorForCommandId(
int command_id,
- ui::Accelerator* accelerator) {
+ ui::Accelerator* accelerator) OVERRIDE {
return false;
}
View
30 custom_handlers/protocol_handler_registry_unittest.cc
@@ -70,19 +70,19 @@ class FakeURLRequestJobFactory : public net::URLRequestJobFactory {
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeInterceptRedirect(
+ virtual net::URLRequestJob* MaybeInterceptRedirect(
const GURL& location,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeInterceptResponse(
+ virtual net::URLRequestJob* MaybeInterceptResponse(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
@@ -124,31 +124,33 @@ class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
public:
FakeDelegate() : force_os_failure_(false) {}
virtual ~FakeDelegate() { }
- virtual void RegisterExternalHandler(const std::string& protocol) {
+ virtual void RegisterExternalHandler(const std::string& protocol) OVERRIDE {
ASSERT_TRUE(
registered_protocols_.find(protocol) == registered_protocols_.end());
registered_protocols_.insert(protocol);
}
- virtual void DeregisterExternalHandler(const std::string& protocol) {
+ virtual void DeregisterExternalHandler(const std::string& protocol) OVERRIDE {
registered_protocols_.erase(protocol);
}
virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
ShellIntegration::DefaultWebClientObserver* observer,
- const std::string& protocol);
+ const std::string& protocol) OVERRIDE;
virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver(
- ProtocolHandlerRegistry* registry);
+ ProtocolHandlerRegistry* registry) OVERRIDE;
- virtual void RegisterWithOSAsDefaultClient(const std::string& protocol,
- ProtocolHandlerRegistry* reg) {
+ virtual void RegisterWithOSAsDefaultClient(
+ const std::string& protocol,
+ ProtocolHandlerRegistry* reg) OVERRIDE {
ProtocolHandlerRegistry::Delegate::RegisterWithOSAsDefaultClient(protocol,
reg);
ASSERT_FALSE(IsFakeRegisteredWithOS(protocol));
}
- virtual bool IsExternalHandlerRegistered(const std::string& protocol) {
+ virtual bool IsExternalHandlerRegistered(
+ const std::string& protocol) OVERRIDE {
return registered_protocols_.find(protocol) != registered_protocols_.end();
}
@@ -186,7 +188,7 @@ class FakeClientObserver
delegate_(registry_delegate) {}
virtual void SetDefaultWebClientUIState(
- ShellIntegration::DefaultWebClientUIState state) {
+ ShellIntegration::DefaultWebClientUIState state) OVERRIDE {
ProtocolHandlerRegistry::DefaultClientObserver::SetDefaultWebClientUIState(
state);
if (state == ShellIntegration::STATE_IS_DEFAULT) {
@@ -255,7 +257,7 @@ class NotificationCounter : public content::NotificationObserver {
void Clear() { events_ = 0; }
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
++events_;
}
@@ -278,7 +280,7 @@ class QueryProtocolHandlerOnChange
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
std::vector<std::string> output;
local_registry_->GetRegisteredProtocols(&output);
called_ = true;
@@ -298,7 +300,7 @@ class QueryProtocolHandlerOnChange
class TestMessageLoop : public MessageLoop {
public:
TestMessageLoop() : MessageLoop(MessageLoop::TYPE_DEFAULT) {}
- ~TestMessageLoop() {}
+ virtual ~TestMessageLoop() {}
virtual bool IsType(MessageLoop::Type type) const OVERRIDE {
switch (type) {
case MessageLoop::TYPE_UI:
View
8 devtools/devtools_file_helper.cc
@@ -83,18 +83,20 @@ class SelectFileDialog : public ui::SelectFileDialog::Listener,
}
// ui::SelectFileDialog::Listener implementation.
- virtual void FileSelected(const FilePath& path, int index, void* params) {
+ virtual void FileSelected(const FilePath& path,
+ int index,
+ void* params) OVERRIDE {
selected_callback_.Run(path);
Release(); // Balanced in ::Show.
}
virtual void MultiFilesSelected(const std::vector<FilePath>& files,
- void* params) {
+ void* params) OVERRIDE {
Release(); // Balanced in ::Show.
NOTREACHED() << "Should not be able to select multiple files";
}
- virtual void FileSelectionCanceled(void* params) {
+ virtual void FileSelectionCanceled(void* params) OVERRIDE {
canceled_callback_.Run();
Release(); // Balanced in ::Show.
}
View
10 devtools/devtools_sanity_browsertest.cc
@@ -60,7 +60,7 @@ class BrowserClosedObserver : public content::NotificationObserver {
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
MessageLoopForUI::current()->Quit();
}
@@ -241,9 +241,9 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
return true;
}
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE {
switch (type) {
case chrome::NOTIFICATION_EXTENSION_LOADED:
case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
@@ -260,7 +260,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
class DevToolsExperimentalExtensionTest : public DevToolsExtensionTest {
public:
- void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
}
};
View
18 diagnostics/diagnostics_main.cc
@@ -139,24 +139,24 @@ class PosixConsole : public SimpleConsole {
public:
PosixConsole() : use_color_(false) { }
- virtual bool Init() {
+ virtual bool Init() OVERRIDE {
// Technically, we should also check the terminal capabilities before using
// color, but in practice this is unlikely to be an issue.
use_color_ = isatty(STDOUT_FILENO);
return true;
}
- virtual bool Write(const std::wstring& text) {
+ virtual bool Write(const std::wstring& text) OVERRIDE {
printf("%s", base::SysWideToNativeMB(text).c_str());
return true;
}
- virtual void OnQuit() {
+ virtual void OnQuit() OVERRIDE {
// The "press enter to continue" prompt isn't very unixy, so only do that on
// Windows.
}
- virtual bool SetColor(Color color) {
+ virtual bool SetColor(Color color) OVERRIDE {
if (!use_color_)
return false;
@@ -292,19 +292,21 @@ class TestController : public DiagnosticsModel::Observer {
}
// Next four are overridden from DiagnosticsModel::Observer.
- virtual void OnProgress(int id, int percent, DiagnosticsModel* model) {
+ virtual void OnProgress(int id,
+ int percent,
+ DiagnosticsModel* model) OVERRIDE {
}
- virtual void OnSkipped(int id, DiagnosticsModel* model) {
+ virtual void OnSkipped(int id, DiagnosticsModel* model) OVERRIDE {
// TODO(cpu): display skipped tests.
}
- virtual void OnFinished(int id, DiagnosticsModel* model) {
+ virtual void OnFinished(int id, DiagnosticsModel* model) OVERRIDE {
// As each test completes we output the results.
ShowResult(&model->GetTest(id));
}
- virtual void OnDoneAll(DiagnosticsModel* model) {
+ virtual void OnDoneAll(DiagnosticsModel* model) OVERRIDE {
if (writer_->failures() > 0) {
writer_->WriteInfoText(base::StringPrintf(
"DONE. %d failure(s)\n\n", writer_->failures()));
View
10 diagnostics/diagnostics_model.cc
@@ -35,19 +35,19 @@ class DiagnosticsModelImpl : public DiagnosticsModel {
DiagnosticsModelImpl() : tests_run_(0) {
}
- ~DiagnosticsModelImpl() {
+ virtual ~DiagnosticsModelImpl() {
STLDeleteElements(&tests_);
}
- virtual int GetTestRunCount() {
+ virtual int GetTestRunCount() OVERRIDE {
return tests_run_;
}
- virtual int GetTestAvailableCount() {
+ virtual int GetTestAvailableCount() OVERRIDE {
return tests_.size();
}
- virtual void RunAll(DiagnosticsModel::Observer* observer) {
+ virtual void RunAll(DiagnosticsModel::Observer* observer) OVERRIDE {
size_t test_count = tests_.size();
for (size_t ix = 0; ix != test_count; ++ix) {
bool do_next = RunTest(tests_[ix], observer, ix);
@@ -58,7 +58,7 @@ class DiagnosticsModelImpl : public DiagnosticsModel {
observer->OnDoneAll(this);
}
- virtual TestInfo& GetTest(size_t id) {
+ virtual TestInfo& GetTest(size_t id) OVERRIDE {
return *tests_[id];
}
View
11 diagnostics/diagnostics_model_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/diagnostics/diagnostics_model.h"
#include "base/command_line.h"
+#include "base/compiler_specific.h"
#include "testing/gtest/include/gtest/gtest.h"
// Basic harness to adquire and release the Diagnostic model object.
@@ -40,16 +41,18 @@ class UTObserver: public DiagnosticsModel::Observer {
id_of_failed_stop_test(-1) {
}
- virtual void OnProgress(int id, int percent, DiagnosticsModel* model) {
+ virtual void OnProgress(int id,
+ int percent,
+ DiagnosticsModel* model) OVERRIDE {
EXPECT_TRUE(model != NULL);
++progress_called_;
}
- virtual void OnSkipped(int id, DiagnosticsModel* model) {
+ virtual void OnSkipped(int id, DiagnosticsModel* model) OVERRIDE {
EXPECT_TRUE(model != NULL);
}
- virtual void OnFinished(int id, DiagnosticsModel* model) {
+ virtual void OnFinished(int id, DiagnosticsModel* model) OVERRIDE {
EXPECT_TRUE(model != NULL);
++finished_;
if (model->GetTest(id).GetResult() == DiagnosticsModel::TEST_FAIL_STOP) {
@@ -58,7 +61,7 @@ class UTObserver: public DiagnosticsModel::Observer {
}
}
- virtual void OnDoneAll(DiagnosticsModel* model) {
+ virtual void OnDoneAll(DiagnosticsModel* model) OVERRIDE {
done_ = true;
EXPECT_TRUE(model != NULL);
}
View
28 diagnostics/recon_diagnostics.cc
@@ -45,9 +45,9 @@ class OperatingSystemTest : public DiagnosticTest {
public:
OperatingSystemTest() : DiagnosticTest(ASCIIToUTF16("Operating System")) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
#if defined(OS_WIN)
base::win::Version version = base::win::GetVersion();
if ((version < base::win::VERSION_XP) ||
@@ -75,9 +75,9 @@ class ConflictingDllsTest : public DiagnosticTest {
public:
ConflictingDllsTest() : DiagnosticTest(ASCIIToUTF16("Conflicting modules")) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
#if defined(OS_WIN)
EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
model->set_limited_mode(true);
@@ -131,9 +131,9 @@ class InstallTypeTest : public DiagnosticTest {
InstallTypeTest() : DiagnosticTest(ASCIIToUTF16("Install Type")),
user_level_(false) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
#if defined(OS_WIN)
FilePath chrome_exe;
if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
@@ -163,9 +163,9 @@ class VersionTest : public DiagnosticTest {
public:
VersionTest() : DiagnosticTest(ASCIIToUTF16("Browser Version")) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
chrome::VersionInfo version_info;
if (!version_info.is_valid()) {
RecordFailure(ASCIIToUTF16("No Version"));
@@ -223,9 +223,9 @@ class PathTest : public DiagnosticTest {
: DiagnosticTest(ASCIIToUTF16(path_info.test_name)),
path_info_(path_info) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
if (!g_install_type) {
RecordStopFailure(ASCIIToUTF16("dependency failure"));
return false;
@@ -288,9 +288,9 @@ class DiskSpaceTest : public DiagnosticTest {
public:
DiskSpaceTest() : DiagnosticTest(ASCIIToUTF16("Disk Space")) {}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
FilePath data_dir;
if (!PathService::Get(chrome::DIR_USER_DATA, &data_dir))
return false;
@@ -319,9 +319,9 @@ class JSONTest : public DiagnosticTest {
: DiagnosticTest(name), path_(path), max_file_size_(max_file_size) {
}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
if (!file_util::PathExists(path_)) {
RecordFailure(ASCIIToUTF16("File not found"));
return true;
View
4 diagnostics/sqlite_diagnostics.cc
@@ -32,9 +32,9 @@ class SqliteIntegrityTest : public DiagnosticTest {
db_path_(profile_relative_db_path) {
}
- virtual int GetId() { return 0; }
+ virtual int GetId() OVERRIDE { return 0; }
- virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
+ virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
FilePath path = GetUserDefaultProfileDir();
path = path.Append(db_path_);
if (!file_util::PathExists(path)) {
View
36 download/download_browsertest.cc
@@ -144,15 +144,20 @@ class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt {
}
// Simulate a user abort on an extension installation.
- virtual void ConfirmInstall(Delegate* delegate,
- const Extension* extension,
- const ShowDialogCallback& show_dialog_callback) {
+ virtual void ConfirmInstall(
+ Delegate* delegate,
+ const Extension* extension,
+ const ShowDialogCallback& show_dialog_callback) OVERRIDE {
delegate->InstallUIAbort(true);
MessageLoopForUI::current()->Quit();
}
- virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
- virtual void OnInstallFailure(const extensions::CrxInstallerError& error) {}
+ virtual void OnInstallSuccess(const Extension* extension,
+ SkBitmap* icon) OVERRIDE {
+ }
+ virtual void OnInstallFailure(
+ const extensions::CrxInstallerError& error) OVERRIDE {
+ }
};
// Mock that simulates a permissions dialog where the user allows
@@ -164,14 +169,19 @@ class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
: ExtensionInstallPrompt(web_contents) {}
// Proceed without confirmation prompt.
- virtual void ConfirmInstall(Delegate* delegate,
- const Extension* extension,
- const ShowDialogCallback& show_dialog_callback) {
+ virtual void ConfirmInstall(
+ Delegate* delegate,
+ const Extension* extension,
+ const ShowDialogCallback& show_dialog_callback) OVERRIDE {
delegate->InstallUIProceed();
}
- virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
- virtual void OnInstallFailure(const extensions::CrxInstallerError& error) {}
+ virtual void OnInstallSuccess(const Extension* extension,
+ SkBitmap* icon) OVERRIDE {
+ }
+ virtual void OnInstallFailure(
+ const extensions::CrxInstallerError& error) OVERRIDE {
+ }
};
static DownloadManager* DownloadManagerForBrowser(Browser* browser) {
@@ -187,9 +197,9 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
virtual ~TestRenderViewContextMenu() {}
private:
- virtual void PlatformInit() {}
- virtual void PlatformCancel() {}
- virtual bool GetAcceleratorForCommandId(int, ui::Accelerator*) {
+ virtual void PlatformInit() OVERRIDE {}
+ virtual void PlatformCancel() OVERRIDE {}
+ virtual bool GetAcceleratorForCommandId(int, ui::Accelerator*) OVERRIDE {
return false;
}
View
4 download/download_request_infobar_delegate_unittest.cc
@@ -16,8 +16,8 @@ class MockTabDownloadState : public DownloadRequestLimiter::TabDownloadState {
virtual ~MockTabDownloadState();
// DownloadRequestLimiter::TabDownloadState
- virtual void Cancel();
- virtual void Accept();
+ virtual void Cancel() OVERRIDE;
+ virtual void Accept() OVERRIDE;
ConfirmInfoBarDelegate* infobar() { return infobar_.get(); }
void delete_infobar_delegate() { infobar_.reset(); }
View
2  download/download_request_limiter_unittest.cc
@@ -93,7 +93,7 @@ class DownloadRequestLimiterTest : public ChromeRenderViewHostTestHarness {
DownloadRequestLimiterTest* test)
: test_(test) { }
- virtual bool ShouldAllowDownload() {
+ virtual bool ShouldAllowDownload() OVERRIDE {
return test_->ShouldAllowDownload();
}
View
12 download/save_page_browsertest.cc
@@ -86,7 +86,7 @@ class DownloadPersistedObserver : public DownloadHistory::Observer {
}
virtual void OnDownloadStored(DownloadItem* item,
- const history::DownloadRow& info) {
+ const history::DownloadRow& info) OVERRIDE {
persisted_ = filter_.Run(item, info);
if (persisted_ && waiting_)
MessageLoopForUI::current()->Quit();
@@ -123,10 +123,10 @@ class DownloadRemovedObserver : public DownloadPersistedObserver {
}
virtual void OnDownloadStored(DownloadItem* item,
- const history::DownloadRow& info) {
+ const history::DownloadRow& info) OVERRIDE {
}
- virtual void OnDownloadsRemoved(const DownloadHistory::IdSet& ids) {
+ virtual void OnDownloadsRemoved(const DownloadHistory::IdSet& ids) OVERRIDE {
removed_ = ids.find(download_id_) != ids.end();
if (removed_ && waiting_)
MessageLoopForUI::current()->Quit();
@@ -195,7 +195,7 @@ class DownloadItemCreatedObserver : public DownloadManager::Observer {
manager->AddObserver(this);
}
- ~DownloadItemCreatedObserver() {
+ virtual ~DownloadItemCreatedObserver() {
if (manager_)
manager_->RemoveObserver(this);
}
@@ -284,13 +284,13 @@ class SavePageBrowserTest : public InProcessBrowserTest {
virtual ~SavePageBrowserTest();
protected:
- void SetUp() OVERRIDE {
+ virtual void SetUp() OVERRIDE {
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
ASSERT_TRUE(save_dir_.CreateUniqueTempDir());
InProcessBrowserTest::SetUp();
}
- void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() OVERRIDE {
browser()->profile()->GetPrefs()->SetFilePath(
prefs::kDownloadDefaultDirectory, save_dir_.path());
BrowserThread::PostTask(
View
2  errorpage_browsertest.cc
@@ -69,7 +69,7 @@ class ErrorPageTest : public InProcessBrowserTest {
}
protected:
- void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() OVERRIDE {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
View
2  external_extension_browsertest.cc
@@ -34,7 +34,7 @@ class SearchProviderTest : public InProcessBrowserTest {
protected:
SearchProviderTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
ASSERT_TRUE(test_server()->Start());
// Map all hosts to our local server.
View
12 external_protocol/external_protocol_handler_unittest.cc
@@ -46,14 +46,14 @@ class FakeExternalProtocolHandlerDelegate
virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
ShellIntegration::DefaultWebClientObserver* observer,
- const std::string& protocol) {
+ const std::string& protocol) OVERRIDE {
return new FakeExternalProtocolHandlerWorker(observer, protocol, os_state_);
}
virtual ExternalProtocolHandler::BlockState GetBlockState(
- const std::string& scheme) { return block_state_; }
+ const std::string& scheme) OVERRIDE { return block_state_; }
- virtual void BlockRequest() {
+ virtual void BlockRequest() OVERRIDE {
ASSERT_TRUE(block_state_ == ExternalProtocolHandler::BLOCK ||
os_state_ == ShellIntegration::IS_DEFAULT);
has_blocked_ = true;
@@ -61,19 +61,19 @@ class FakeExternalProtocolHandlerDelegate
virtual void RunExternalProtocolDialog(const GURL& url,
int render_process_host_id,
- int routing_id) {
+ int routing_id) OVERRIDE {
ASSERT_EQ(block_state_, ExternalProtocolHandler::UNKNOWN);
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT);
has_prompted_ = true;
}
- virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) {
+ virtual void LaunchUrlWithoutSecurityCheck(const GURL& url) OVERRIDE {
ASSERT_EQ(block_state_, ExternalProtocolHandler::DONT_BLOCK);
ASSERT_NE(os_state_, ShellIntegration::IS_DEFAULT);
has_launched_ = true;
}
- virtual void FinishedProcessingCheck() {
+ virtual void FinishedProcessingCheck() OVERRIDE {
MessageLoop::current()->Quit();
}
View
2  fast_shutdown_browsertest.cc
@@ -25,7 +25,7 @@ class FastShutdown : public InProcessBrowserTest {
FastShutdown() {
}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kDisablePopupBlocking);
}
View
8 favicon/favicon_handler_unittest.cc
@@ -171,19 +171,19 @@ class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
: web_contents_(web_contents) {
}
- virtual NavigationEntry* GetActiveEntry() {
+ virtual NavigationEntry* GetActiveEntry() OVERRIDE {
ADD_FAILURE() << "TestFaviconHandlerDelegate::GetActiveEntry() "
<< "should never be called in tests.";
return NULL;
}
- virtual int StartDownload(const GURL& url, int image_size) {
+ virtual int StartDownload(const GURL& url, int image_size) OVERRIDE {
ADD_FAILURE() << "TestFaviconHandlerDelegate::StartDownload() "
<< "should never be called in tests.";
return -1;
}
- virtual void NotifyFaviconUpdated() {
+ virtual void NotifyFaviconUpdated() OVERRIDE {
web_contents_->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
}
@@ -223,7 +223,7 @@ class TestFaviconHandler : public FaviconHandler {
return download_handler_.get();
}
- virtual NavigationEntry* GetEntry() {
+ virtual NavigationEntry* GetEntry() OVERRIDE {
return entry_.get();
}
View
2  feedback/feedback_util.cc
@@ -106,7 +106,7 @@ class FeedbackUtil::PostCleanup : public net::URLFetcherDelegate {
post_body_(post_body),
previous_delay_(previous_delay) { }
// Overridden from net::URLFetcherDelegate.
- virtual void OnURLFetchComplete(const net::URLFetcher* source);
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
protected:
virtual ~PostCleanup() {}
View
2  first_run/first_run.cc
@@ -90,7 +90,7 @@ class FirstRunDelayedTasks : public content::NotificationObserver {
private:
// Private ctor forces it to be created only in the heap.
- ~FirstRunDelayedTasks() {}
+ virtual ~FirstRunDelayedTasks() {}
// The extension work is to basically trigger an extension update check.
// If the extension specified in the master pref is older than the live
View
4 fullscreen_gtk.cc
@@ -60,7 +60,7 @@ class WindowManagerWindowFinder : public ui::EnumerateWindowsDelegate {
XID window() const { return window_; }
protected:
- virtual bool ShouldStopIterating(XID window) {
+ virtual bool ShouldStopIterating(XID window) OVERRIDE {
if (ui::PropertyExists(window, "WM_STATE")) {
window_ = window;
return true;
@@ -82,7 +82,7 @@ class TopMostWindowFinder : public ui::EnumerateWindowsDelegate {
XID top_most_window() const { return top_most_window_; }
protected:
- virtual bool ShouldStopIterating(XID window) {
+ virtual bool ShouldStopIterating(XID window) OVERRIDE {
if (!ui::IsWindowVisible(window))
return false;
if (ui::PropertyExists(window, "WM_STATE")) {
View
2  geolocation/chrome_geolocation_permission_context_unittest.cc
@@ -52,7 +52,7 @@ class ClosedDelegateTracker : public content::NotificationObserver {
// content::NotificationObserver:
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
size_t size() const {
return removed_infobar_delegates_.size();
View
8 geolocation/geolocation_browsertest.cc
@@ -80,7 +80,7 @@ class IFrameLoader : public content::NotificationObserver {
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
if (type == content::NOTIFICATION_LOAD_STOP) {
navigation_completed_ = true;
} else if (type == content::NOTIFICATION_DOM_OPERATION_RESPONSE) {
@@ -156,7 +156,7 @@ class GeolocationNotificationObserver : public content::NotificationObserver {
// content::NotificationObserver
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
if (type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED) {
infobar_ = content::Details<InfoBarAddedDetails>(details).ptr();
ASSERT_TRUE(infobar_->GetIcon());
@@ -211,12 +211,12 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
started_test_server_(false) {}
// InProcessBrowserTest
- virtual void SetUpOnMainThread() {
+ virtual void SetUpOnMainThread() OVERRIDE {
ui_test_utils::OverrideGeolocation(fake_latitude_, fake_longitude_);
}
// InProcessBrowserTest
- virtual void TearDownInProcessBrowserTestFixture() {
+ virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
LOG(WARNING) << "TearDownInProcessBrowserTestFixture. Test Finished.";
}
View
2  geolocation/geolocation_infobar_queue_controller_unittest.cc
@@ -60,7 +60,7 @@ class ObservationCountingQueueController :
// GeolocationInfoBarQueueController
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
static void NotifyPermissionSet(const GeolocationPermissionRequestID& id,
const GURL& requesting_frame,
View
2  google/google_url_tracker_unittest.cc
@@ -73,7 +73,7 @@ class TestNotificationObserver : public content::NotificationObserver {
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
bool notified() const { return notified_; }
void clear_notified() { notified_ = false; }
View
2  gpu/chrome_gpu_util.cc
@@ -57,7 +57,7 @@ class BrowserMonitor : public chrome::BrowserListObserver {
BrowserMonitor() : num_browsers_(0), installed_(false) {
}
- ~BrowserMonitor() {
+ virtual ~BrowserMonitor() {
}
// BrowserListObserver implementation.
View
4 history/expire_history_backend.cc
@@ -48,7 +48,7 @@ const int kEarlyExpirationAdvanceDays = 3;
class AllVisitsReader : public ExpiringVisitsReader {
public:
virtual bool Read(Time end_time, HistoryDatabase* db,
- VisitVector* visits, int max_visits) const {
+ VisitVector* visits, int max_visits) const OVERRIDE {
DCHECK(db) << "must have a database to operate upon";
DCHECK(visits) << "visit vector has to exist in order to populate it";
@@ -68,7 +68,7 @@ class AllVisitsReader : public ExpiringVisitsReader {
class AutoSubframeVisitsReader : public ExpiringVisitsReader {
public:
virtual bool Read(Time end_time, HistoryDatabase* db,
- VisitVector* visits, int max_visits) const {
+ VisitVector* visits, int max_visits) const OVERRIDE {
DCHECK(db) << "must have a database to operate upon";
DCHECK(visits) << "visit vector has to exist in order to populate it";
View
9 history/expire_history_backend_unittest.cc
@@ -127,7 +127,7 @@ class ExpireHistoryTest : public testing::Test,
NotificationList notifications_;
private:
- void SetUp() {
+ virtual void SetUp() {
ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
FilePath history_name = path().Append(kHistoryFile);
@@ -157,7 +157,7 @@ class ExpireHistoryTest : public testing::Test,
top_sites_ = profile_.GetTopSites();
}
- void TearDown() {
+ virtual void TearDown() {
top_sites_ = NULL;
ClearLastNotifications();
@@ -171,8 +171,9 @@ class ExpireHistoryTest : public testing::Test,
}
// BroadcastNotificationDelegate implementation.
- void BroadcastNotifications(int type,
- HistoryDetails* details_deleted) {
+ virtual void BroadcastNotifications(
+ int type,
+ HistoryDetails* details_deleted) OVERRIDE {
// This gets called when there are notifications to broadcast. Instead, we
// store them so we can tell that the correct notifications were sent.
notifications_.push_back(std::make_pair(type, details_deleted));
View
4 history/history_browsertest.cc
@@ -43,11 +43,11 @@ class WaitForHistoryTask : public HistoryDBTask {
WaitForHistoryTask() {}
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();
}
View
9 history/history_unittest.cc
@@ -106,7 +106,7 @@ class HistoryBackendDBTest : public HistoryUnitTestBase {
HistoryBackendDBTest() : db_(NULL) {
}
- ~HistoryBackendDBTest() {
+ virtual ~HistoryBackendDBTest() {
}
protected:
@@ -564,7 +564,7 @@ class HistoryTest : public testing::Test {
query_url_success_(false) {
}
- ~HistoryTest() {
+ virtual ~HistoryTest() {
}
void OnSegmentUsageAvailable(CancelableRequestProvider::Handle handle,
@@ -1189,11 +1189,12 @@ class HistoryDBTaskImpl : public HistoryDBTask {
HistoryDBTaskImpl() : invoke_count(0), done_invoked(false) {}
- virtual bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) {
+ virtual bool RunOnDBThread(HistoryBackend* backend,
+ HistoryDatabase* db) OVERRIDE {
return (++invoke_count == kWantInvokeCount);
}
- virtual void DoneRunOnMainThread() {
+ virtual void DoneRunOnMainThread() OVERRIDE {
done_invoked = true;
MessageLoop::current()->Quit();
}
View
2  history/in_memory_url_index_unittest.cc
@@ -385,7 +385,7 @@ void InMemoryURLIndexTest::ExpectPrivateDataEqual(
class LimitedInMemoryURLIndexTest : public InMemoryURLIndexTest {
protected:
- FilePath::StringType TestDBName() const;
+ virtual FilePath::StringType TestDBName() const OVERRIDE;
};
FilePath::StringType LimitedInMemoryURLIndexTest::TestDBName() const {
View
5 history/multipart_browsertest.cc
@@ -19,8 +19,9 @@ class MultipartResponseTest : public InProcessBrowserTest,
MultipartResponseTest() : did_navigate_any_frame_count_(0),
update_history_count_(0) {}
- void DidNavigateAnyFrame(const content::LoadCommittedDetails& details,
- const content::FrameNavigateParams& params) {
+ virtual void DidNavigateAnyFrame(
+ const content::LoadCommittedDetails& details,
+ const content::FrameNavigateParams& params) OVERRIDE {
did_navigate_any_frame_count_++;
if (params.should_update_history)
update_history_count_++;
View
2  history/scored_history_match_unittest.cc
@@ -276,7 +276,7 @@ class BookmarkServiceMock : public BookmarkService {
virtual ~BookmarkServiceMock() {}
// Returns true if the given |url| is the same as |url_|.
- bool IsBookmarked(const GURL& url) OVERRIDE;
+ virtual bool IsBookmarked(const GURL& url) OVERRIDE;
// Required but unused.
virtual void GetBookmarks(std::vector<URLAndTitle>* bookmarks) OVERRIDE {}
View
4 history/shortcuts_backend_unittest.cc
@@ -33,8 +33,8 @@ class ShortcutsBackendTest : public testing::Test,
load_notified_(false),
changed_notified_(false) {}
- void SetUp();
- void TearDown();
+ virtual void SetUp();
+ virtual void TearDown();
virtual void OnShortcutsLoaded() OVERRIDE;
virtual void OnShortcutsChanged() OVERRIDE;
View
4 history/shortcuts_database_unittest.cc
@@ -42,8 +42,8 @@ struct ShortcutsDatabaseTestInfo {
class ShortcutsDatabaseTest : public testing::Test {
public:
- void SetUp();
- void TearDown();
+ virtual void SetUp();
+ virtual void TearDown();
void ClearDB();
size_t CountRecords() const;
View
8 history/text_database_manager_unittest.cc
@@ -51,11 +51,11 @@ class InMemDB : public URLDatabase, public VisitDatabase {
CreateURLTable(false);
InitVisitTable();
}
- ~InMemDB() {
+ virtual ~InMemDB() {
}
private:
- virtual sql::Connection& GetDB() { return db_; }
+ virtual sql::Connection& GetDB() OVERRIDE { return db_; }
sql::Connection db_;
@@ -157,10 +157,10 @@ class TextDatabaseManagerTest : public testing::Test {
}
protected:
- void SetUp() {
+ virtual void SetUp() {
}
- void TearDown() {
+ virtual void TearDown() {
file_util::Delete(dir_, true);
}
View
2  history/text_database_unittest.cc
@@ -88,7 +88,7 @@ class TextDatabaseTest : public PlatformTest {
TextDatabaseTest() {}
protected:
- void SetUp() {
+ virtual void SetUp() {
PlatformTest::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
View
4 history/thumbnail_database_unittest.cc
@@ -55,7 +55,7 @@ class ThumbnailDatabaseTest : public testing::Test {
public:
ThumbnailDatabaseTest() {
}
- ~ThumbnailDatabaseTest() {
+ virtual ~ThumbnailDatabaseTest() {
}
protected:
@@ -89,7 +89,7 @@ class IconMappingMigrationTest : public HistoryUnitTestBase {
public:
IconMappingMigrationTest() {
}
- ~IconMappingMigrationTest() {
+ virtual ~IconMappingMigrationTest() {
}
protected:
View
4 history/top_sites.cc
@@ -121,7 +121,7 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
}
virtual bool RunOnDBThread(history::HistoryBackend* backend,
- history::HistoryDatabase* db) {
+ history::HistoryDatabase* db) OVERRIDE {
// Get the most visited urls.
backend->QueryMostVisitedURLsImpl(result_count_,
kDaysOfHistory,
@@ -139,7 +139,7 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
return true;
}
- virtual void DoneRunOnMainThread() {
+ virtual void DoneRunOnMainThread() OVERRIDE {
top_sites_->FinishHistoryMigration(data_);
}
View
7 history/top_sites_unittest.cc
@@ -52,11 +52,12 @@ class WaitForHistoryTask : public HistoryDBTask {
public:
WaitForHistoryTask() {}
- virtual bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) {
+ virtual bool RunOnDBThread(HistoryBackend* backend,
+ HistoryDatabase* db) OVERRIDE {
return true;
}
- virtual void DoneRunOnMainThread() {
+ virtual void DoneRunOnMainThread() OVERRIDE {
MessageLoop::current()->Quit();
}
@@ -362,7 +363,7 @@ class TopSitesMigrationTest : public TopSitesTest {
}
// Returns true if history and top sites should be created in SetUp.
- virtual bool CreateHistoryAndTopSites() {
+ virtual bool CreateHistoryAndTopSites() OVERRIDE {
return false;
}
View
6 history/url_database_unittest.cc
@@ -41,13 +41,13 @@ class URLDatabaseTest : public testing::Test,
protected:
// Provided for URL/VisitDatabase.
- virtual sql::Connection& GetDB() {
+ virtual sql::Connection& GetDB() OVERRIDE {
return db_;
}
private:
// Test setup.
- void SetUp() {
+ virtual void SetUp() {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
FilePath db_file = temp_dir_.path().AppendASCII("URLTest.db");
@@ -59,7 +59,7 @@ class URLDatabaseTest : public testing::Test,
InitKeywordSearchTermsTable();
CreateKeywordSearchTermsIndices();
}
- void TearDown() {
+ virtual void TearDown() {
db_.Close();
}
View
6 history/visit_database_unittest.cc
@@ -45,7 +45,7 @@ class VisitDatabaseTest : public PlatformTest,
private:
// Test setup.
- void SetUp() {
+ virtual void SetUp() {
PlatformTest::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
FilePath db_file = temp_dir_.path().AppendASCII("VisitTest.db");
@@ -57,13 +57,13 @@ class VisitDatabaseTest : public PlatformTest,
CreateMainURLIndex();
InitVisitTable();
}
- void TearDown() {
+ virtual void TearDown() {
db_.Close();
PlatformTest::TearDown();
}
// Provided for URL/VisitDatabase.
- virtual sql::Connection& GetDB() {
+ virtual sql::Connection& GetDB() OVERRIDE {
return db_;
}
View
4 history/visit_filter_unittest.cc
@@ -28,8 +28,8 @@ class VisitFilterTest : public testing::Test {
VisitFilterTest();
protected:
- void SetUp();
- void TearDown();
+ virtual void SetUp();
+ virtual void TearDown();
};
VisitFilterTest::VisitFilterTest() {
View
32 importer/firefox_importer_unittest.cc
@@ -141,16 +141,16 @@ class FirefoxObserver : public ProfileWriter,
EXPECT_EQ(arraysize(kFirefox2Keywords), keyword_count_);
}
- virtual bool BookmarkModelIsLoaded() const {
+ virtual bool BookmarkModelIsLoaded() const OVERRIDE {
// Profile is ready for writing.
return true;
}
- virtual bool TemplateURLServiceIsLoaded() const {
+ virtual bool TemplateURLServiceIsLoaded() const OVERRIDE {
return true;
}
- virtual void AddPasswordForm(const content::PasswordForm& form) {
+ virtual void AddPasswordForm(const content::PasswordForm& form) OVERRIDE {
PasswordInfo p = kFirefox2Passwords[password_count_];
EXPECT_EQ(p.origin, form.origin.spec());
EXPECT_EQ(p.realm, form.signon_realm);
@@ -164,7 +164,7 @@ class FirefoxObserver : public ProfileWriter,
}
virtual void AddHistoryPage(const history::URLRows& page,
- history::VisitSource visit_source) {
+ history::VisitSource visit_source) OVERRIDE {
ASSERT_EQ(1U, page.size());
EXPECT_EQ("http://en-us.www.mozilla.com/", page[0].url().spec());
EXPECT_EQ(ASCIIToUTF16("Firefox Updated"), page[0].title());
@@ -182,7 +182,7 @@ class FirefoxObserver : public ProfileWriter,
}
virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
- bool unique_on_host_and_path) {
+ bool unique_on_host_and_path) OVERRIDE {
for (size_t i = 0; i < template_urls.size(); ++i) {
// The order might not be deterministic, look in the expected list for
// that template URL.
@@ -201,11 +201,12 @@ class FirefoxObserver : public ProfileWriter,
}
}
- void AddFavicons(const std::vector<history::ImportedFaviconUsage>& favicons) {
+ virtual void AddFavicons(
+ const std::vector<history::ImportedFaviconUsage>& favicons) OVERRIDE {
}
private:
- ~FirefoxObserver() {}
+ virtual ~FirefoxObserver() {}
size_t bookmark_count_;
size_t history_count_;
@@ -286,16 +287,16 @@ class Firefox3Observer : public ProfileWriter,
EXPECT_EQ(arraysize(kFirefox3Keywords), keyword_count_);
}
- virtual bool BookmarkModelIsLoaded() const {
+ virtual bool BookmarkModelIsLoaded() const OVERRIDE {
// Profile is ready for writing.
return true;
}
- virtual bool TemplateURLServiceIsLoaded() const {
+ virtual bool TemplateURLServiceIsLoaded() const OVERRIDE {
return true;
}
- virtual void AddPasswordForm(const content::PasswordForm& form) {
+ virtual void AddPasswordForm(const content::PasswordForm& form) OVERRIDE {
PasswordInfo p = kFirefox3Passwords[password_count_];
EXPECT_EQ(p.origin, form.origin.spec());
EXPECT_EQ(p.realm, form.signon_realm);
@@ -309,7 +310,7 @@ class Firefox3Observer : public ProfileWriter,
}
virtual void AddHistoryPage(const history::URLRows& page,
- history::VisitSource visit_source) {
+ history::VisitSource visit_source) OVERRIDE {
ASSERT_EQ(3U, page.size());
EXPECT_EQ("http://www.google.com/", page[0].url().spec());
EXPECT_EQ(ASCIIToUTF16("Google"), page[0].title());
@@ -331,8 +332,8 @@ class Firefox3Observer : public ProfileWriter,
}
}
- void AddKeywords(ScopedVector<TemplateURL> template_urls,
- bool unique_on_host_and_path) {
+ virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
+ bool unique_on_host_and_path) OVERRIDE {
for (size_t i = 0; i < template_urls.size(); ++i) {
// The order might not be deterministic, look in the expected list for
// that template URL.
@@ -351,11 +352,12 @@ class Firefox3Observer : public ProfileWriter,
}
}
- void AddFavicons(const std::vector<history::ImportedFaviconUsage>& favicons) {
+ virtual void AddFavicons(
+ const std::vector<history::ImportedFaviconUsage>& favicons) OVERRIDE {
}
private:
- ~Firefox3Observer() {}
+ virtual ~Firefox3Observer() {}
size_t bookmark_count_;
size_t history_count_;
View
2  importer/firefox_importer_utils.cc
@@ -35,7 +35,7 @@ class FirefoxURLParameterFilter : public TemplateURLParser::ParameterFilter {
// TemplateURLParser::ParameterFilter method.
virtual bool KeepParameter(const std::string& key,
- const std::string& value) {
+ const std::string& value) OVERRIDE {
std::string low_value = StringToLowerASCII(value);
if (low_value.find("mozilla") != std::string::npos ||
low_value.find("firefox") != std::string::npos ||
View
2  infobars/infobars_browsertest.cc
@@ -23,7 +23,7 @@ class InfoBarsTest : public InProcessBrowserTest {
public:
InfoBarsTest() {}
- void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
}
View
2  instant/instant_loader.cc
@@ -33,7 +33,7 @@ class InstantLoaderUserData : public base::SupportsUserData::Data {
InstantLoader* loader() const { return loader_; }
private:
- ~InstantLoaderUserData() {}
+ virtual ~InstantLoaderUserData() {}
InstantLoader* const loader_;
View
2  intents/native_services_browsertest.cc
@@ -127,7 +127,7 @@ class TestSelectFileDialogFactory : public ui::SelectFileDialogFactory {
public:
virtual ui::SelectFileDialog* Create(
ui::SelectFileDialog::Listener* listener,
- ui::SelectFilePolicy* policy) {
+ ui::SelectFilePolicy* policy) OVERRIDE {
return TestSelectFileDialog::Create(listener, policy);
}
};
View
2  intents/web_intents_registry.cc
@@ -175,7 +175,7 @@ class WebIntentsRegistry::QueryAdapter : public WebDataServiceConsumer {
registry_->TrackQuery(this);
}
- void OnWebDataServiceRequestDone(
+ virtual void OnWebDataServiceRequestDone(
WebDataService::Handle h,
const WDTypedResult* result) OVERRIDE {
View
2  io_thread.cc
@@ -251,7 +251,7 @@ class IOThread::LoggingNetworkChangeObserver
net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
}
- ~LoggingNetworkChangeObserver() {
+ virtual ~LoggingNetworkChangeObserver() {
net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
View
10 jankometer.cc
@@ -66,7 +66,7 @@ class JankWatchdog : public base::Watchdog {
virtual ~JankWatchdog() {}
- virtual void Alarm() {
+ virtual void Alarm() OVERRIDE {
// Put break point here if you want to stop threads and look at what caused
// the jankiness.
alarm_count_++;
@@ -257,7 +257,7 @@ class IOJankObserver : public base::RefCountedThreadSafe<IOJankObserver>,