Chromium style checker cleanup

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047
TBR=ben, brettw, jamesr, joi, satorux, piman, wez

Review URL: https://chromiumcodereview.appspot.com/12813004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188311 0039d316-1c4b-4281-b951-d872f2087c98

46 files changed, 102 insertions, 89 deletions

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 74dfb5c..f9d324e 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -69,21 +69,21 @@ class ShelfWidget::DelegateView : public views::WidgetDelegate,
   bool GetDimmed() const { return dimmed_; }
 
   // views::View overrides:
-  void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
 
   // views::WidgetDelegateView overrides:
-  views::Widget* GetWidget() OVERRIDE {
+  virtual views::Widget* GetWidget() OVERRIDE {
     return View::GetWidget();
   }
-  const views::Widget* GetWidget() const OVERRIDE {
+  virtual const views::Widget* GetWidget() const OVERRIDE {
     return View::GetWidget();
   }
 
-  bool CanActivate() const OVERRIDE;
-  void Layout() OVERRIDE;
+  virtual bool CanActivate() const OVERRIDE;
+  virtual void Layout() OVERRIDE;
 
   // BackgroundAnimatorDelegate overrides:
-  void UpdateBackground(int alpha) OVERRIDE;
+  virtual void UpdateBackground(int alpha) OVERRIDE;
 
  private:
   ShelfWidget* shelf_;
diff --git a/cc/layer_tree_host_unittest_delegated.cc b/cc/layer_tree_host_unittest_delegated.cc
index ecec114..dfc5fca 100644
--- a/cc/layer_tree_host_unittest_delegated.cc
+++ b/cc/layer_tree_host_unittest_delegated.cc
@@ -243,7 +243,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
 
   virtual bool prepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                      LayerTreeHostImpl::FrameData* frame,
-                                     bool result) {
+                                     bool result) OVERRIDE {
     EXPECT_TRUE(result);
 
     if (!first_draw_for_source_frame_)
diff --git a/cc/picture_layer_impl_unittest.cc b/cc/picture_layer_impl_unittest.cc
index 527f7c0..486011a 100644
--- a/cc/picture_layer_impl_unittest.cc
+++ b/cc/picture_layer_impl_unittest.cc
@@ -136,7 +136,7 @@ class MockCanvas : public SkCanvas {
  public:
   explicit MockCanvas(SkDevice* device) : SkCanvas(device) {}
 
-  virtual void drawRect(const SkRect& rect, const SkPaint& paint) {
+  virtual void drawRect(const SkRect& rect, const SkPaint& paint) OVERRIDE {
     // Capture calls before SkCanvas quickReject kicks in
     rects_.push_back(rect);
   }
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index 86610ae..45c2640 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -16,7 +16,7 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl {
   }
 
  protected:
-  ~FakeInfinitePicturePileImpl() {}
+  virtual ~FakeInfinitePicturePileImpl() {}
 };
 
 FakePictureLayerTilingClient::FakePictureLayerTilingClient()
diff --git a/cc/worker_pool.cc b/cc/worker_pool.cc
index e2c2af4..d3e1ec2 100644
--- a/cc/worker_pool.cc
+++ b/cc/worker_pool.cc
@@ -67,7 +67,7 @@ class WorkerPool::Inner : public base::DelegateSimpleThread::Delegate {
         size_t num_threads,
         const std::string& thread_name_prefix,
         bool need_on_task_completed_callback);
-  ~Inner();
+  virtual ~Inner();
 
   void Shutdown();
 
diff --git a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
index bf2e241..d0697f3 100644
--- a/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
+++ b/chrome/browser/autofill/autofill_external_delegate_browsertest.cc
@@ -72,7 +72,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
   TestAutofillExternalDelegate(content::WebContents* web_contents,
                                AutofillManager* autofill_manager)
       : AutofillExternalDelegate(web_contents, autofill_manager) {}
-  ~TestAutofillExternalDelegate() {}
+  virtual ~TestAutofillExternalDelegate() {}
 };
 
 }  // namespace
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index ab3fcc7..9ff875b 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -169,7 +169,7 @@ class SuspendStateDelegateImpl
   }
 
   // chromeos::SessionManagerClient::Observer implementation.
-  virtual void ScreenIsUnlocked() {
+  virtual void ScreenIsUnlocked() OVERRIDE {
     is_resuming_ = true;
     // Undo any previous resets.
     weak_factory_.InvalidateWeakPtrs();
diff --git a/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc b/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc
index 857027e..ac4b584 100644
--- a/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_configuration_unittest.cc
@@ -13,10 +13,10 @@ namespace input_method {
 
 class InputMethodConfigurationTest : public testing::Test {
  public:
-  void SetUp() {
+  virtual void SetUp() {
   }
 
-  void TearDown() {
+  virtual void TearDown() {
   }
 };
 
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
index 048ed35..c907de9 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
@@ -305,7 +305,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer {
   virtual void OnSurroundingTextChanged(const std::string& engine_id,
                                         const std::string& text,
                                         int cursor_pos,
-                                        int anchor_pos) {
+                                        int anchor_pos) OVERRIDE {
     if (profile_ == NULL || extension_id_.empty())
       return;
     DictionaryValue* dict = new DictionaryValue();
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
index 22350f2..45c25bc 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
@@ -37,7 +37,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
     sync_setup_helper_.reset(new SyncSetupHelper());
   }
 
-  ~PushMessagingCanaryTest() {
+  virtual ~PushMessagingCanaryTest() {
   }
 
   virtual void SetUp() OVERRIDE {
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 33356cf..1434cb0 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -121,7 +121,7 @@ class ExtensionCrashRecoveryTestBase : public ExtensionBrowserTest {
 class MessageCenterExtensionCrashRecoveryTest
     : public ExtensionCrashRecoveryTestBase {
  protected:
-  virtual void AcceptNotification(size_t index) {
+  virtual void AcceptNotification(size_t index) OVERRIDE {
     message_center::MessageCenter* message_center =
         message_center::MessageCenter::Get();
     ASSERT_GT(message_center->NotificationCount(), index);
@@ -134,7 +134,7 @@ class MessageCenterExtensionCrashRecoveryTest
     WaitForExtensionLoad();
   }
 
-  virtual void CancelNotification(size_t index) {
+  virtual void CancelNotification(size_t index) OVERRIDE {
     message_center::MessageCenter* message_center =
         message_center::MessageCenter::Get();
     ASSERT_GT(message_center->NotificationCount(), index);
@@ -145,7 +145,7 @@ class MessageCenterExtensionCrashRecoveryTest
         g_browser_process->notification_ui_manager()->CancelById((*it)->id()));
   }
 
-  virtual size_t CountBalloons() {
+  virtual size_t CountBalloons() OVERRIDE {
     message_center::MessageCenter* message_center =
         message_center::MessageCenter::Get();
     return message_center->NotificationCount();
@@ -160,21 +160,21 @@ typedef MessageCenterExtensionCrashRecoveryTest
 class BalloonExtensionCrashRecoveryTest
     : public ExtensionCrashRecoveryTestBase {
  protected:
-  virtual void AcceptNotification(size_t index) {
+  virtual void AcceptNotification(size_t index) OVERRIDE {
     Balloon* balloon = GetNotificationDelegate(index);
     ASSERT_TRUE(balloon);
     balloon->OnClick();
     WaitForExtensionLoad();
   }
 
-  virtual void CancelNotification(size_t index) {
+  virtual void CancelNotification(size_t index) OVERRIDE {
     Balloon* balloon = GetNotificationDelegate(index);
     ASSERT_TRUE(balloon);
     std::string id = balloon->notification().notification_id();
     ASSERT_TRUE(g_browser_process->notification_ui_manager()->CancelById(id));
   }
 
-  virtual size_t CountBalloons() {
+  virtual size_t CountBalloons() OVERRIDE {
     BalloonNotificationUIManager* manager =
         BalloonNotificationUIManager::GetInstanceForTesting();
     BalloonCollection::Balloons balloons =
diff --git a/chrome/browser/history/delete_directive_handler.cc b/chrome/browser/history/delete_directive_handler.cc
index 80dfec7..6a6242d 100644
--- a/chrome/browser/history/delete_directive_handler.cc
+++ b/chrome/browser/history/delete_directive_handler.cc
@@ -81,7 +81,7 @@ class DeleteDirectiveHandler::DeleteDirectiveTask : public HistoryDBTask {
   virtual void DoneRunOnMainThread() OVERRIDE;
 
  private:
-  ~DeleteDirectiveTask() {}
+  virtual ~DeleteDirectiveTask() {}
 
   // Process a list of global Id directives. Delete all visits to a URL in
   // time ranges of directives if the timestamp of one visit matches with one
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
index d0f9a73..55ef39b 100644
--- a/chrome/browser/notifications/notification_browsertest.cc
+++ b/chrome/browser/notifications/notification_browsertest.cc
@@ -76,7 +76,7 @@ class MessageCenterChangeObserver
     message_center::MessageCenter::Get()->AddObserver(this);
   }
 
-  ~MessageCenterChangeObserver() {
+  virtual ~MessageCenterChangeObserver() {
     message_center::MessageCenter::Get()->RemoveObserver(this);
   }
 
@@ -89,7 +89,7 @@ class MessageCenterChangeObserver
     return notification_received_;
   }
 
-  virtual void OnMessageCenterChanged(bool new_notification) {
+  virtual void OnMessageCenterChanged(bool new_notification) OVERRIDE {
     notification_received_ = true;
     if (message_loop_runner_)
       message_loop_runner_->Quit();
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_service.cc b/chrome/browser/policy/cloud/component_cloud_policy_service.cc
index 42344f4..3da09ca 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_service.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_service.cc
@@ -36,7 +36,7 @@ class ComponentCloudPolicyService::Backend
   Backend(base::WeakPtr<ComponentCloudPolicyService> service,
           scoped_refptr<base::SequencedTaskRunner> task_runner,
           scoped_ptr<ResourceCache> cache);
-  ~Backend();
+  virtual ~Backend();
 
   // This is invoked right after the constructor but on the backend background
   // thread. Used to create the store on the right thread.
diff --git a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
index a37ee7a..e041b1c 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
+++ b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
@@ -47,7 +47,7 @@ class InvalidatorStorageTest : public testing::Test {
         kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"),
         kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {}
 
-  void SetUp() {
+  virtual void SetUp() {
     InvalidatorStorage::RegisterUserPrefs(pref_service_.registry());
   }
 
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
index 3411d53..793045f 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
@@ -26,7 +26,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
                                AutofillManager* autofill_manager)
       : AutofillExternalDelegate(web_contents, autofill_manager),
         popup_hidden_(true) {}
-  ~TestAutofillExternalDelegate() {}
+  virtual ~TestAutofillExternalDelegate() {}
 
   virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE {
     popup_hidden_ = false;
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index ffcb673..317a2ee 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -46,7 +46,7 @@ class MockAutofillManagerDelegate
   MockAutofillManagerDelegate() {}
   virtual ~MockAutofillManagerDelegate() {}
 
-  virtual PrefService* GetPrefs() { return &prefs_; }
+  virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
 
  private:
   TestingPrefServiceSimple prefs_;
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index a899ec5..aeaa1df 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -191,7 +191,7 @@ class FullscreenTestBrowserWindow : public TestBrowserWindow {
   virtual ~FullscreenTestBrowserWindow() {}
 
   // TestBrowserWindow overrides:
-  virtual bool ShouldHideUIForFullscreen() const {
+  virtual bool ShouldHideUIForFullscreen() const OVERRIDE {
     return fullscreen_;
   }
   virtual bool IsFullscreen() const OVERRIDE {
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index 7c90c8c..5c5a5b5 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -64,8 +64,10 @@ class MockDisplaySettingsProviderImpl :
   // Overridden from DisplaySettingsProvider:
   virtual gfx::Rect GetPrimaryDisplayArea() const OVERRIDE;
   virtual gfx::Rect GetPrimaryWorkArea() const OVERRIDE;
-  virtual gfx::Rect GetDisplayAreaMatching(const gfx::Rect& bounds) const;
-  virtual gfx::Rect GetWorkAreaMatching(const gfx::Rect& bounds) const;
+  virtual gfx::Rect GetDisplayAreaMatching(
+      const gfx::Rect& bounds) const OVERRIDE;
+  virtual gfx::Rect GetWorkAreaMatching(
+      const gfx::Rect& bounds) const OVERRIDE;
   virtual bool IsAutoHidingDesktopBarEnabled(
       DesktopBarAlignment alignment) OVERRIDE;
   virtual int GetDesktopBarThickness(
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 1c0d61b..281a477 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -40,7 +40,7 @@ class ScrollableView : public views::View {
   ScrollableView() {}
   virtual ~ScrollableView() {}
 
-  void Layout() OVERRIDE;
+  virtual void Layout() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScrollableView);
diff --git a/chrome/common/extensions/api/page_launcher/page_launcher_manifest_unittest.cc b/chrome/common/extensions/api/page_launcher/page_launcher_manifest_unittest.cc
index bb44a58..125e033 100644
--- a/chrome/common/extensions/api/page_launcher/page_launcher_manifest_unittest.cc
+++ b/chrome/common/extensions/api/page_launcher/page_launcher_manifest_unittest.cc
@@ -14,7 +14,7 @@
 namespace extensions {
 
 class PageLauncherManifestTest : public ExtensionManifestTest {
-  void SetUp() OVERRIDE {
+  virtual void SetUp() OVERRIDE {
     ExtensionManifestTest::SetUp();
     (new PageLauncherHandler)->Register();
     // Required to be recognized as a platform app.
diff --git a/chrome/common/extensions/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc
index 0c3f77a..9c5cb02 100644
--- a/chrome/common/extensions/manifest_handler_unittest.cc
+++ b/chrome/common/extensions/manifest_handler_unittest.cc
@@ -131,13 +131,14 @@ class ManifestHandlerTest : public testing::Test {
       return true;
     }
 
-    virtual bool Validate(const Extension* extension,
-                          std::string* error,
-                          std::vector<InstallWarning>* warnings) const {
+    virtual bool Validate(
+        const Extension* extension,
+        std::string* error,
+        std::vector<InstallWarning>* warnings) const OVERRIDE {
       return return_value_;
     }
 
-    virtual bool AlwaysValidateForType(Manifest::Type type) const {
+    virtual bool AlwaysValidateForType(Manifest::Type type) const OVERRIDE {
       return always_validate_;
     }
 
diff --git a/chrome/renderer/benchmarking_extension.cc b/chrome/renderer/benchmarking_extension.cc
index 7572a40..84e3001 100644
--- a/chrome/renderer/benchmarking_extension.cc
+++ b/chrome/renderer/benchmarking_extension.cc
@@ -56,7 +56,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("GetCounter"))) {
       return v8::FunctionTemplate::New(GetCounter);
     } else if (name->Equals(v8::String::New("IsSingleProcess"))) {
diff --git a/chrome/renderer/net_benchmarking_extension.cc b/chrome/renderer/net_benchmarking_extension.cc
index 9fb0581..eaec99a 100644
--- a/chrome/renderer/net_benchmarking_extension.cc
+++ b/chrome/renderer/net_benchmarking_extension.cc
@@ -48,7 +48,7 @@ class NetBenchmarkingWrapper : 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("ClearCache"))) {
       return v8::FunctionTemplate::New(ClearCache);
     } else if (name->Equals(v8::String::New("ClearHostResolverCache"))) {
diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc
index 7634523..b682944 100644
--- a/chrome/service/cloud_print/printer_job_handler_unittest.cc
+++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc
@@ -248,7 +248,7 @@ class CloudPrintURLFetcherNoServiceProcess
       context_getter_(new net::TestURLRequestContextGetter(
           base::MessageLoopProxy::current())) {}
  protected:
-  virtual net::URLRequestContextGetter* GetRequestContextGetter() {
+  virtual net::URLRequestContextGetter* GetRequestContextGetter() OVERRIDE {
     return context_getter_.get();
   }
 
@@ -261,7 +261,7 @@ class CloudPrintURLFetcherNoServiceProcess
 class CloudPrintURLFetcherNoServiceProcessFactory
     : public CloudPrintURLFetcherFactory {
  public:
-  virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() {
+  virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() OVERRIDE {
     return new CloudPrintURLFetcherNoServiceProcess;
   }
 
@@ -437,8 +437,8 @@ class MockPrintSystem : public PrintSystem {
 class PrinterJobHandlerTest : public ::testing::Test {
  public:
   PrinterJobHandlerTest();
-  void SetUp() OVERRIDE;
-  void TearDown() OVERRIDE;
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
   void IdleOut();
   bool GetPrinterInfo(printing::PrinterBasicInfo* info);
   void SendCapsAndDefaults(
diff --git a/chrome/service/cloud_print/printer_job_queue_handler.cc b/chrome/service/cloud_print/printer_job_queue_handler.cc
index 78c70fa..e7d00f0 100644
--- a/chrome/service/cloud_print/printer_job_queue_handler.cc
+++ b/chrome/service/cloud_print/printer_job_queue_handler.cc
@@ -14,7 +14,7 @@ namespace cloud_print {
 
 class TimeProviderImpl : public PrinterJobQueueHandler::TimeProvider {
  public:
-    base::Time GetNow();
+    virtual base::Time GetNow() OVERRIDE;
 };
 
 base::Time TimeProviderImpl::GetNow() {
diff --git a/chrome/test/chromedriver/session_unittest.cc b/chrome/test/chromedriver/session_unittest.cc
index e88fa70..095fe7e 100644
--- a/chrome/test/chromedriver/session_unittest.cc
+++ b/chrome/test/chromedriver/session_unittest.cc
@@ -31,7 +31,7 @@ class MockChrome : public StubChrome {
   MockChrome() : web_view_("1") {}
   virtual ~MockChrome() {}
 
-  Status GetWebViews(std::list<WebView*>* web_views) OVERRIDE {
+  virtual Status GetWebViews(std::list<WebView*>* web_views) OVERRIDE {
     web_views->clear();
     web_views->push_back(&web_view_);
     return Status(kOk);
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index d5e6c65..7fecfb4 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -264,7 +264,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
   }
 
   // MergeSettingsAndPolicies override.
-  virtual scoped_ptr<base::Value> MergeValues(ValueParams values) {
+  virtual scoped_ptr<base::Value> MergeValues(
+      ValueParams values) OVERRIDE {
     std::string which;
     return MergeValues(values, &which);
   }
@@ -276,7 +277,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
 class MergeToAugmented : public MergeToEffective {
  protected:
   // MergeSettingsAndPolicies override.
-  virtual scoped_ptr<base::Value> MergeValues(ValueParams values) {
+  virtual scoped_ptr<base::Value> MergeValues(
+      ValueParams values) OVERRIDE {
     scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
     std::string which_effective;
     MergeToEffective::MergeValues(values, &which_effective).reset();
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index 634c8c9..be8e875 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -60,7 +60,7 @@ class MockAutofillManagerDelegate
  public:
   MockAutofillManagerDelegate() {}
   virtual ~MockAutofillManagerDelegate() {}
-  virtual PrefService* GetPrefs() { return &prefs_; }
+  virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
 
  private:
   TestingPrefServiceSimple prefs_;
diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc
index ae4bb37..01fe4ab 100644
--- a/content/browser/renderer_host/image_transport_factory.cc
+++ b/content/browser/renderer_host/image_transport_factory.cc
@@ -90,7 +90,7 @@ class NoTransportFactory : public ImageTransportFactory {
     return 0;
   }
 
-  void WaitSyncPoint(uint32 sync_point) OVERRIDE {
+  virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE {
   }
 
   // We don't generate lost context events, so we don't need to keep track of
@@ -588,7 +588,7 @@ class GpuProcessTransportFactory
     virtual ~MainThreadContextProvider() {}
 
     virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
-        CreateOffscreenContext3d() {
+        CreateOffscreenContext3d() OVERRIDE {
       return make_scoped_ptr(factory_->CreateOffscreenContext());
     }
 
@@ -623,7 +623,7 @@ class GpuProcessTransportFactory
     virtual ~CompositorThreadContextProvider() {}
 
     virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
-        CreateOffscreenContext3d() {
+        CreateOffscreenContext3d() OVERRIDE {
       return make_scoped_ptr(factory_->CreateOffscreenContext());
     }
 
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
index d6c19c7..8bb0e35 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
@@ -255,7 +255,7 @@ class CaptureTestRenderViewHostFactory : public RenderViewHostFactory {
       RenderWidgetHostDelegate* widget_delegate,
       int routing_id,
       bool swapped_out,
-      SessionStorageNamespace* session_storage_namespace) {
+      SessionStorageNamespace* session_storage_namespace) OVERRIDE {
     return new CaptureTestRenderViewHost(instance, delegate, widget_delegate,
                                          routing_id, swapped_out, controller_);
   }
diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc
index 2796007..a291c31 100644
--- a/content/common/gpu/client/context_provider_command_buffer.cc
+++ b/content/common/gpu/client/context_provider_command_buffer.cc
@@ -33,7 +33,8 @@ class ContextProviderCommandBuffer::MemoryAllocationCallbackProxy
     provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this);
   }
 
-  void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation alloc) {
+  virtual void onMemoryAllocationChanged(
+      WebKit::WebGraphicsMemoryAllocation alloc) {
     provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes);
   }
 
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index fbd83367..062ced8 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -42,7 +42,7 @@ class TestRendererAccessibilityComplete : public RendererAccessibilityComplete {
     TestRendererAccessibilityComplete* owner_;
   };
 
-  virtual BrowserTreeNode* CreateBrowserTreeNode() {
+  virtual BrowserTreeNode* CreateBrowserTreeNode() OVERRIDE {
     return new TestBrowserTreeNode(this);
   }
 
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 0271718..4f88790 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -246,7 +246,7 @@ class RenderThreadImpl::RendererContextProviderCommandBuffer
   virtual ~RendererContextProviderCommandBuffer() {}
 
   virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
-  CreateOffscreenContext3d() {
+  CreateOffscreenContext3d() OVERRIDE {
     RenderThreadImpl* self = RenderThreadImpl::current();
     DCHECK(self);
     return self->CreateOffscreenContext3d().Pass();
diff --git a/gpu/command_buffer/service/gpu_tracer.cc b/gpu/command_buffer/service/gpu_tracer.cc
index 178cb7a..b4899f5 100644
--- a/gpu/command_buffer/service/gpu_tracer.cc
+++ b/gpu/command_buffer/service/gpu_tracer.cc
@@ -90,7 +90,7 @@ class GLARBTimerTrace : public Trace {
   virtual void Process() OVERRIDE;
 
  private:
-  ~GLARBTimerTrace();
+  virtual ~GLARBTimerTrace();
 
   void Output();
 
@@ -118,7 +118,7 @@ class NoopTrace : public Trace {
   virtual void Process() OVERRIDE {}
 
  private:
-  ~NoopTrace() {}
+  virtual ~NoopTrace() {}
 
   DISALLOW_COPY_AND_ASSIGN(NoopTrace);
 };
diff --git a/net/quic/congestion_control/leaky_bucket_test.cc b/net/quic/congestion_control/leaky_bucket_test.cc
index b542370..977ef94 100644
--- a/net/quic/congestion_control/leaky_bucket_test.cc
+++ b/net/quic/congestion_control/leaky_bucket_test.cc
@@ -13,7 +13,7 @@ namespace test {
 
 class LeakyBucketTest : public ::testing::Test {
  protected:
-  void SetUp() {
+  virtual void SetUp() {
     leaky_bucket_.reset(new LeakyBucket(QuicBandwidth::Zero()));
   }
   MockClock clock_;
diff --git a/net/quic/crypto/crypto_framer.cc b/net/quic/crypto/crypto_framer.cc
index e2909d4..b22dbb2 100644
--- a/net/quic/crypto/crypto_framer.cc
+++ b/net/quic/crypto/crypto_framer.cc
@@ -26,11 +26,12 @@ class OneShotVisitor : public CryptoFramerVisitorInterface {
         error_(false) {
   }
 
-  void OnError(CryptoFramer* framer) {
+  virtual void OnError(CryptoFramer* framer) OVERRIDE {
     error_ = true;
   }
 
-  void OnHandshakeMessage(const CryptoHandshakeMessage& message) {
+  virtual void OnHandshakeMessage(
+      const CryptoHandshakeMessage& message) OVERRIDE {
     *out_ = message;
   }
 
diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc
index 10dcb5b..81f67bb 100644
--- a/net/quic/quic_crypto_client_stream_test.cc
+++ b/net/quic/quic_crypto_client_stream_test.cc
@@ -26,7 +26,7 @@ class TestQuicVisitor : public NoOpFramerVisitor {
   }
 
   // NoOpFramerVisitor
-  virtual void OnStreamFrame(const QuicStreamFrame& frame) {
+  virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
     frame_ = frame;
     frame_valid_ = true;
   }
@@ -51,8 +51,10 @@ class TestMockSession : public MockSession {
   }
   virtual ~TestMockSession() {}
 
-  virtual QuicConsumedData WriteData(QuicStreamId id, base::StringPiece data,
-                                     QuicStreamOffset offset, bool fin) {
+  virtual QuicConsumedData WriteData(QuicStreamId id,
+                                     base::StringPiece data,
+                                     QuicStreamOffset offset,
+                                     bool fin) OVERRIDE {
     return QuicSession::WriteData(id, data, offset, fin);
   }
 };
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index db8841d..b95af91 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -38,7 +38,7 @@ class TestQuicVisitor : public NoOpFramerVisitor {
   TestQuicVisitor() {}
 
   // NoOpFramerVisitor
-  virtual void OnStreamFrame(const QuicStreamFrame& frame) {
+  virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
     frame_ = frame;
   }
 
diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc
index 8af9baf..497b91a 100644
--- a/net/quic/quic_framer_test.cc
+++ b/net/quic/quic_framer_test.cc
@@ -225,7 +225,7 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface {
     connection_close_frame_ = frame;
   }
 
-  virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) {
+  virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE {
     goaway_frame_ = frame;
   }
 
diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc
index d529ac7..b9b690d 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -21,7 +21,7 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
       : error_(QUIC_NO_ERROR) {
   }
 
-  virtual void OnError(QuicFramer* framer) {
+  virtual void OnError(QuicFramer* framer) OVERRIDE {
     error_ = framer->error();
   }
 
@@ -29,21 +29,22 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
     return false;
   }
 
-  virtual void OnPacket() {}
-  virtual void OnPublicResetPacket(const QuicPublicResetPacket& packet) {}
+  virtual void OnPacket() OVERRIDE {}
+  virtual void OnPublicResetPacket(
+      const QuicPublicResetPacket& packet) OVERRIDE {}
   virtual void OnVersionNegotiationPacket(
-      const QuicVersionNegotiationPacket& packet) {}
-  virtual void OnRevivedPacket() {}
+      const QuicVersionNegotiationPacket& packet) OVERRIDE {}
+  virtual void OnRevivedPacket() OVERRIDE {}
 
-  virtual bool OnPacketHeader(const QuicPacketHeader& header) {
+  virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE {
     has_header_ = true;
     header_ = header;
     return true;
   }
 
-  virtual void OnFecProtectedPayload(StringPiece payload) {}
+  virtual void OnFecProtectedPayload(StringPiece payload) OVERRIDE {}
 
-  virtual void OnStreamFrame(const QuicStreamFrame& frame) {
+  virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
     // Save a copy of the data so it is valid after the packet is processed.
     stream_data_.push_back(frame.data.as_string());
     QuicStreamFrame stream_frame(frame);
@@ -52,35 +53,35 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
     stream_frames_.push_back(stream_frame);
   }
 
-  virtual void OnAckFrame(const QuicAckFrame& frame) {
+  virtual void OnAckFrame(const QuicAckFrame& frame) OVERRIDE {
     ack_frames_.push_back(frame);
   }
 
   virtual void OnCongestionFeedbackFrame(
-      const QuicCongestionFeedbackFrame& frame) {
+      const QuicCongestionFeedbackFrame& frame) OVERRIDE {
     feedback_frames_.push_back(frame);
   }
 
-  virtual void OnFecData(const QuicFecData& fec) {
+  virtual void OnFecData(const QuicFecData& fec) OVERRIDE {
     fec_data_ = fec;
     fec_redundancy_ = fec_data_.redundancy.as_string();
     fec_data_.redundancy = fec_redundancy_;
   }
 
-  virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) {
+  virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE {
     rst_stream_frames_.push_back(frame);
   }
 
   virtual void OnConnectionCloseFrame(
-      const QuicConnectionCloseFrame& frame) {
+      const QuicConnectionCloseFrame& frame) OVERRIDE {
     connection_close_frames_.push_back(frame);
   }
 
-  virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) {
+  virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE {
     goaway_frames_.push_back(frame);
   }
 
-  virtual void OnPacketComplete() {}
+  virtual void OnPacketComplete() OVERRIDE {}
 
   const QuicPacketHeader& header() const { return header_; }
   const vector<QuicAckFrame>& ack_frames() const { return ack_frames_; }
diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc
index d54b542..f318bc5 100644
--- a/remoting/host/resizing_host_observer_unittest.cc
+++ b/remoting/host/resizing_host_observer_unittest.cc
@@ -30,7 +30,7 @@ class FakeDesktopResizer : public DesktopResizer {
     }
   }
 
-  ~FakeDesktopResizer() {
+  virtual ~FakeDesktopResizer() {
     EXPECT_EQ(initial_size_, GetCurrentSize());
   }
 
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index bff9e8b..47b72583 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -128,13 +128,15 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
     return !!context3d_;
   }
 
-  virtual bool BindToCurrentThread() {
+  virtual bool BindToCurrentThread() OVERRIDE {
     return context3d_->makeContextCurrent();
   }
 
-  virtual WebKit::WebGraphicsContext3D* Context3d() { return context3d_.get(); }
+  virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
+    return context3d_.get();
+  }
 
-  virtual class GrContext* GrContext() {
+  virtual class GrContext* GrContext() OVERRIDE {
     if (!gr_context_) {
       gr_context_.reset(
           new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));
@@ -149,7 +151,7 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
     destroyed_ = true;
   }
 
-  bool DestroyedOnMainThread() {
+  virtual bool DestroyedOnMainThread() OVERRIDE {
     base::AutoLock lock(destroyed_lock_);
     return destroyed_;
   }
diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc
index 4db8aee..e925a14 100644
--- a/ui/message_center/views/message_center_bubble.cc
+++ b/ui/message_center/views/message_center_bubble.cc
@@ -210,7 +210,7 @@ class WebNotificationButtonView2 : public WebNotificationButtonViewBase,
 
  private:
   // Overridden from views::View:
-  virtual void ChildVisibilityChanged(views::View* child) {
+  virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
     InvalidateLayout();
   }
 
diff --git a/webkit/gpu/context_provider_in_process.cc b/webkit/gpu/context_provider_in_process.cc
index b68f370..27c5465 100644
--- a/webkit/gpu/context_provider_in_process.cc
+++ b/webkit/gpu/context_provider_in_process.cc
@@ -36,7 +36,8 @@ class ContextProviderInProcess::MemoryAllocationCallbackProxy
     provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this);
   }
 
-  void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation alloc) {
+  virtual void onMemoryAllocationChanged(
+      WebKit::WebGraphicsMemoryAllocation alloc) {
     provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes);
   }
 
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index be8fd2e..7b73660 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -967,7 +967,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
     static_cast<SyncRequestProxy*>(proxy_)->WaitForCompletion();
   }
 
-  virtual void DidChangePriority(net::RequestPriority new_priority) {
+  virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE {
     // Not really needed for DRT.
   }