Standardize usage of virtual/override/final in chrome/browser/browsing_data/

chrome/browser/browsing_data/browsing_data_remover.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
@@ skipping 232 matching lines @@
   // Creates a BrowsingDataRemover to remove browser data from the specified
   // profile in the specified time range. Use Remove to initiate the removal.
   BrowsingDataRemover(Profile* profile,
                       base::Time delete_begin,
                       base::Time delete_end);
 
   // BrowsingDataRemover deletes itself (using DeleteHelper) and is not supposed
   // to be deleted by other objects so make destructor private and DeleteHelper
   // a friend.
   friend class base::DeleteHelper<BrowsingDataRemover>;
-  virtual ~BrowsingDataRemover();
+  ~BrowsingDataRemover() override;

[dcheng, 2014/10/21 09:52:50]

Ugh. It turns out this is only conditionally an override--there are times when
it has no base class!

Would you consider having an #if defined(ENABLE_PLUGINS)/#else stanza acceptable
here?

[Mike West, 2014/10/21 10:08:06]

Bleh. That's unfortunate.

The #if/#else sounds fine, as long as you add a comment explaining why you had
to do it.

[dcheng, 2014/10/21 21:38:16]

Done.

 
   // Callback for when TemplateURLService has finished loading. Clears the data,
   // clears the respective waiting flag, and invokes NotifyAndDeleteIfDone.
   void OnKeywordsLoaded();
 
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
   void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
 
 #if defined(ENABLE_PLUGINS)
   // PepperFlashSettingsManager::Client implementation.
-  virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
-                                                     bool success) override;
+  void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
+                                             bool success) override;
 #endif
 
 #if defined (OS_CHROMEOS)
   void OnClearPlatformKeys(chromeos::DBusMethodCallStatus call_status,
                            bool result);
 #endif
 
   // Removes the specified items related to browsing for a specific host. If the
   // provided |origin| is empty, data is removed for all origins. The
   // |origin_set_mask| parameter defines the set of origins from which data
@@ skipping 182 matching lines @@
 
   scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
 
   // We do not own this.
   content::StoragePartition* storage_partition_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_