Remove a few more semicolons.

TBR=rsesek

Bug: 926235
Change-Id: Ibaf250d761cc5f0fc5e334319c12ecb09f7e69c6
Reviewed-on: https://chromium-review.googlesource.com/c/1461320
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630638}

chrome/browser/local_discovery/service_discovery_client_mdns.cc

@@ -182,7 +182,7 @@ class ProxyBase : public ServiceDiscoveryClientMdns::Proxy, public T {
 
   void OnMdnsDestroy() override {
     DeleteOnMdnsThread(implementation_.release());
-  };
+  }
 
  protected:
   void set_implementation(std::unique_ptr<T> implementation) {
@@ -279,7 +279,7 @@ class ServiceResolverProxy : public ProxyBase<ServiceResolver> {
       PostToMdnsThread(base::Bind(&ServiceResolver::StartResolving,
                                   base::Unretained(implementation())));
     }
-  };
+  }
 
   std::string GetName() const override { return service_name_; }
 
@@ -319,7 +319,7 @@ class LocalDomainResolverProxy : public ProxyBase<LocalDomainResolver> {
       PostToMdnsThread(base::Bind(&LocalDomainResolver::Start,
                                   base::Unretained(implementation())));
     }
-  };
+  }
 
  private:
   static void OnCallback(const WeakPtr& proxy,

components/autofill/core/browser/autofill_metadata.h

@@ -15,8 +15,8 @@ namespace autofill {
 // abstract the data from the metadata.
 struct AutofillMetadata {
  public:
-  AutofillMetadata(){};
+  AutofillMetadata() {}
-  ~AutofillMetadata(){};
+  ~AutofillMetadata() {}
 
   bool operator==(const AutofillMetadata&) const;
   bool operator!=(const AutofillMetadata&) const;

components/autofill/core/browser/autofill_scanner.h

@@ -46,7 +46,7 @@ class AutofillScanner {
   size_t SaveCursor();
 
   // This is only for logging purposes.
-  size_t CursorIndex() { return static_cast<size_t>(cursor_ - begin_); };
+  size_t CursorIndex() { return static_cast<size_t>(cursor_ - begin_); }
 
  private:
   void Init(const std::vector<AutofillField*>& fields);

components/autofill/core/browser/form_structure.h

@@ -319,7 +319,7 @@ class FormStructure {
   // - Name for Autofill of first field
   base::string16 GetIdentifierForRefill() const;
 
-  int developer_engagement_metrics() { return developer_engagement_metrics_; };
+  int developer_engagement_metrics() { return developer_engagement_metrics_; }
 
   void set_randomized_encoder(std::unique_ptr<RandomizedEncoder> encoder);
 
@@ -348,7 +348,7 @@ class FormStructure {
       if (sectioned_indexes.empty())
         return (size_t)-1;  // Shouldn't happen.
       return sectioned_indexes.back().back();
-    };
+    }
 
     void AddFieldIndex(const size_t index, bool is_new_section) {
       if (is_new_section || Empty()) {

components/autofill/core/common/form_field_data.h

@@ -108,7 +108,7 @@ struct FormFieldData {
   // Returns true if the field is visible to the user.
   bool IsVisible() const {
     return is_focusable && role != ROLE_ATTRIBUTE_PRESENTATION;
-  };
+  }
 
   // Note: operator==() performs a full-field-comparison(byte by byte), this is
   // different from SameFieldAs(), which ignores comparison for those "values"

components/bookmarks/browser/titled_url_node_sorter.h

@@ -18,7 +18,7 @@ class TitledUrlNodeSorter {
   using TitledUrlNodes = std::vector<const TitledUrlNode*>;
   using TitledUrlNodeSet = base::flat_set<const TitledUrlNode*>;
 
-  virtual ~TitledUrlNodeSorter() {};
+  virtual ~TitledUrlNodeSorter() {}
 
   // Sorts |matches| in an implementation-specific way, placing the results in
   // |sorted_nodes|.

components/browsing_data/core/counters/bookmark_counter.cc

@@ -42,7 +42,7 @@ class BookmarkModelHelper : public bookmarks::BaseBookmarkModelObserver {
                            bool ids_reassigned) override {
     std::move(callback_).Run(model);
     delete this;
-  };
+  }
 
   void BookmarkModelBeingDeleted(
       bookmarks::BookmarkModel* bookmark_model) override {

components/browsing_data/core/counters/passwords_counter.h

@@ -29,7 +29,7 @@ class PasswordsCounter : public browsing_data::BrowsingDataCounter,
  protected:
   virtual std::unique_ptr<SyncResult> MakeResult();
 
-  bool is_sync_active() { return sync_tracker_.IsSyncActive(); };
+  bool is_sync_active() { return sync_tracker_.IsSyncActive(); }
   int num_passwords() { return num_passwords_; }
 
  private:

components/cast_certificate/cast_crl.h

@@ -23,7 +23,7 @@ namespace cast_certificate {
 // This class represents the CRL information parsed from the binary proto.
 class CastCRL {
  public:
-  virtual ~CastCRL(){};
+  virtual ~CastCRL() {}
 
   // Verifies the revocation status of a cast device certificate given a chain
   // of X.509 certificates.

components/cast_channel/mojo_data_pump.h

@@ -14,7 +14,7 @@
 
 namespace net {
 class IOBuffer;
-};  // namespace net
+}  // namespace net
 
 namespace cast_channel {
 

components/cloud_devices/common/description_items.h

@@ -158,8 +158,8 @@ class BooleanCapability {
 template <class Traits>
 class EmptyCapability {
  public:
-  EmptyCapability() {};
+  EmptyCapability() {}
-  ~EmptyCapability() {};
+  ~EmptyCapability() {}
 
   bool LoadFrom(const CloudDeviceDescription& description);
   void SaveTo(CloudDeviceDescription* description) const;

components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc

@@ -82,9 +82,9 @@ bool OriginIdentifierValueMap::PatternPair::operator<(
          std::tie(other.primary_pattern, other.secondary_pattern);
 }
 
-OriginIdentifierValueMap::ValueEntry::ValueEntry(){};
+OriginIdentifierValueMap::ValueEntry::ValueEntry() {}
 
-OriginIdentifierValueMap::ValueEntry::~ValueEntry(){};
+OriginIdentifierValueMap::ValueEntry::~ValueEntry() {}
 
 std::unique_ptr<RuleIterator> OriginIdentifierValueMap::GetRuleIterator(
     ContentSettingsType content_type,

components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.h

@@ -13,7 +13,7 @@ struct DataReductionProxyPageLoadTiming;
 // server.
 class DataReductionProxyPingbackClient {
  public:
-  virtual ~DataReductionProxyPingbackClient(){};
+  virtual ~DataReductionProxyPingbackClient() {}
 
   // Sends a pingback to the data saver proxy server about various timing
   // information.

components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

@@ -288,7 +288,7 @@ const net::HttpRequestHeaders&
 DataReductionProxySettings::GetProxyRequestHeaders() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return proxy_request_headers_;
-};
+}
 
 void DataReductionProxySettings::SetProxyRequestHeaders(
     const net::HttpRequestHeaders& headers) {

components/dom_distiller/core/distilled_content_store.h

@@ -35,8 +35,8 @@ class DistilledContentStore {
   virtual void LoadContent(const ArticleEntry& entry,
                            LoadCallback callback) = 0;
 
-  DistilledContentStore() {};
+  DistilledContentStore() {}
-  virtual ~DistilledContentStore() {};
+  virtual ~DistilledContentStore() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DistilledContentStore);

components/dom_distiller/core/dom_distiller_switches.cc

@@ -17,11 +17,11 @@ const char kAllArticles[] = "allarticles";
 const char kOGArticle[] = "opengraph";
 const char kAlwaysTrue[] = "alwaystrue";
 const char kNone[] = "none";
-};
+}  // namespace reader_mode_heuristics
 
 namespace reader_mode_feedback {
 const char kOn[] = "on";
 const char kOff[] = "off";
-};
+}  // namespace reader_mode_feedback
 
 }  // namespace switches

components/dom_distiller/core/dom_distiller_switches.h

@@ -28,12 +28,12 @@ extern const char kAllArticles[];
 extern const char kOGArticle[];
 extern const char kAlwaysTrue[];
 extern const char kNone[];
-};
+}  // namespace reader_mode_heuristics
 
 namespace reader_mode_feedback {
 extern const char kOn[];
 extern const char kOff[];
-};
+}  // namespace reader_mode_feedback
 
 }  // namespace switches
 

components/download/internal/common/download_worker.cc

@@ -30,7 +30,7 @@ bool IsURLSafe(int render_process_id, const GURL& url) {
 
 class CompletedInputStream : public InputStream {
  public:
-  CompletedInputStream(DownloadInterruptReason status) : status_(status){};
+  CompletedInputStream(DownloadInterruptReason status) : status_(status) {}
   ~CompletedInputStream() override = default;
 
   // InputStream

components/download/public/background_service/navigation_monitor.h

@@ -53,7 +53,7 @@ class NavigationMonitor : public KeyedService {
                          base::TimeDelta navigation_timeout_delay) = 0;
 
  protected:
-  ~NavigationMonitor() override{};
+  ~NavigationMonitor() override {}
 };
 
 }  // namespace download

components/favicon/core/favicon_server_fetcher_params.h

@@ -24,13 +24,13 @@ class FaviconServerFetcherParams {
 
   ~FaviconServerFetcherParams();
 
-  const GURL& page_url() const { return page_url_; };
+  const GURL& page_url() const { return page_url_; }
-  favicon_base::IconType icon_type() const { return icon_type_; };
+  favicon_base::IconType icon_type() const { return icon_type_; }
-  int min_source_size_in_pixel() const { return min_source_size_in_pixel_; };
+  int min_source_size_in_pixel() const { return min_source_size_in_pixel_; }
-  int desired_size_in_pixel() const { return desired_size_in_pixel_; };
+  int desired_size_in_pixel() const { return desired_size_in_pixel_; }
   const std::string& google_server_client_param() const {
     return google_server_client_param_;
-  };
+  }
 
  private:
   FaviconServerFetcherParams(const GURL& page_url,

components/favicon/core/large_icon_service.h

@@ -98,7 +98,7 @@ class LargeIconService : public KeyedService {
   virtual void TouchIconFromGoogleServer(const GURL& icon_url) = 0;
 
  protected:
-  LargeIconService(){};
+  LargeIconService() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LargeIconService);

components/invalidation/impl/per_user_topic_registration_request.cc

@@ -77,7 +77,7 @@ void RecordRequestStatus(
   }
 }
 
-};  // namespace
+}  // namespace
 
 namespace syncer {
 

components/metrics/persisted_logs_metrics.h

@@ -34,7 +34,7 @@ class PersistedLogsMetrics {
   PersistedLogsMetrics() {}
   virtual ~PersistedLogsMetrics() {}
 
-  virtual void RecordLogReadStatus(LogReadStatus status){};
+  virtual void RecordLogReadStatus(LogReadStatus status) {}
 
   virtual void RecordCompressionRatio(
     size_t compressed_size, size_t original_size) {}

components/metrics/reporting_service.h

@@ -72,7 +72,7 @@ class ReportingService {
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  protected:
-  MetricsServiceClient* client() const { return client_; };
+  MetricsServiceClient* client() const { return client_; }
 
  private:
   // Retrieves the log store backing this service.

components/ntp_snippets/reading_list/reading_list_suggestions_provider.cc

@@ -47,7 +47,7 @@ ReadingListSuggestionsProvider::ReadingListSuggestionsProvider(
   scoped_observer_.Add(reading_list_model_);
 }
 
-ReadingListSuggestionsProvider::~ReadingListSuggestionsProvider(){};
+ReadingListSuggestionsProvider::~ReadingListSuggestionsProvider() {}
 
 CategoryStatus ReadingListSuggestionsProvider::GetCategoryStatus(
     Category category) {

components/omnibox/browser/shortcuts_backend.h

@@ -40,7 +40,7 @@ void PopulateShortcutsBackendWithTestData(
 namespace history {
 class HistoryService;
 class ShortcutsDatabase;
-};  // namespace history
+}  // namespace history
 
 // This class manages the shortcut provider backend - access to database on the
 // db thread, etc.

components/pdf/renderer/pdf_accessibility_tree.h

@@ -23,7 +23,7 @@ class RendererPpapiHost;
 
 namespace gfx {
 class Transform;
-};
+}
 
 namespace pdf {
 

components/policy/core/common/cloud/cloud_policy_client.h

@@ -344,7 +344,7 @@ class POLICY_EXPORT CloudPolicyClient {
   const std::string& client_id() const { return client_id_; }
   const base::DictionaryValue* configuration_seed() const {
     return configuration_seed_.get();
-  };
+  }
 
   // The device mode as received in the registration request.
   DeviceMode device_mode() const { return device_mode_; }

components/policy/core/common/cloud/user_info_fetcher.cc

@@ -121,4 +121,4 @@ void UserInfoFetcher::OnFetchComplete(
   }
 }
 
-};  // namespace policy
+}  // namespace policy

components/previews/core/bloom_filter.h

@@ -42,7 +42,7 @@ class BloomFilter {
   void Add(const std::string& str);
 
   // Returns the bit array data of this Bloom filter as vector of bytes.
-  const ByteVector& bytes() const { return bytes_; };
+  const ByteVector& bytes() const { return bytes_; }
 
  private:
   // Number of bits to set for each added string.

components/rappor/bloom_filter.h

@@ -30,7 +30,7 @@ class BloomFilter {
   void SetString(const std::string& str);
 
   // Returns the current value of the Bloom filter's bit array.
-  const ByteVector& bytes() const { return bytes_; };
+  const ByteVector& bytes() const { return bytes_; }
 
  private:
   // Stores the byte array of the Bloom filter.

components/rappor/log_uploader_interface.h

@@ -9,8 +9,8 @@ namespace rappor {
 
 class LogUploaderInterface {
  public:
-  LogUploaderInterface() {};
+  LogUploaderInterface() {}
-  virtual ~LogUploaderInterface() {};
+  virtual ~LogUploaderInterface() {}
 
   // Begin uploading logs.
   virtual void Start() = 0;

components/reading_list/core/reading_list_entry.cc

@@ -51,7 +51,7 @@ const net::BackoffEntry::Policy ReadingListEntry::kBackoffPolicy = {
 ReadingListEntry::ReadingListEntry(const GURL& url,
                                    const std::string& title,
                                    const base::Time& now)
-    : ReadingListEntry(url, title, now, nullptr){};
+    : ReadingListEntry(url, title, now, nullptr) {}
 
 ReadingListEntry::ReadingListEntry(const GURL& url,
                                    const std::string& title,

components/safe_browsing/triggers/trigger_throttler.h

@@ -47,7 +47,7 @@ enum class TriggerType {
 struct TriggerTypeHash {
   std::size_t operator()(TriggerType trigger_type) const {
     return static_cast<std::size_t>(trigger_type);
-  };
+  }
 };
 
 // A map for storing a list of event timestamps for different trigger types.

components/security_interstitials/content/unsafe_resource.cc

@@ -22,7 +22,7 @@ content::WebContents* GetWebContentsByFrameID(int render_process_id,
   return content::WebContents::FromRenderFrameHost(render_frame_host);
 }
 
-};  // namespace
+}  // namespace
 
 UnsafeResource::UnsafeResource()
     : is_subresource(false),

components/security_interstitials/core/base_safe_browsing_error_ui.h

@@ -140,7 +140,7 @@ class BaseSafeBrowsingErrorUI {
 
   const std::string app_locale() const { return app_locale_; }
 
-  ControllerClient* controller() { return controller_; };
+  ControllerClient* controller() { return controller_; }
 
   GURL request_url() const { return request_url_; }
   GURL main_frame_url() const { return main_frame_url_; }

components/signin/core/browser/about_signin_internals.cc

@@ -536,7 +536,7 @@ AboutSigninInternals::TokenInfo::ToValue() const {
 }
 
 AboutSigninInternals::RefreshTokenEvent::RefreshTokenEvent()
-    : timestamp(base::Time::Now()){};
+    : timestamp(base::Time::Now()) {}
 
 std::string AboutSigninInternals::RefreshTokenEvent::GetTypeAsString() const {
   switch (type) {

components/signin/core/browser/signin_header_helper.cc

@@ -107,7 +107,7 @@ std::string BuildMirrorRequestCookieIfPossible(
 }
 
 SigninHeaderHelper::SigninHeaderHelper(const std::string& histogram_suffix)
-    : histogram_suffix_(histogram_suffix){};
+    : histogram_suffix_(histogram_suffix) {}
 SigninHeaderHelper::~SigninHeaderHelper() = default;
 
 bool SigninHeaderHelper::AppendOrRemoveRequestHeader(

components/signin/core/browser/webdata/token_web_data.cc

@@ -67,7 +67,7 @@ class TokenWebDataBackend
 TokenResult::TokenResult()
     : db_result(TokenServiceTable::TOKEN_DB_RESULT_SQL_INVALID_STATEMENT) {}
 TokenResult::TokenResult(const TokenResult& other) = default;
-TokenResult::~TokenResult(){};
+TokenResult::~TokenResult() {}
 
 TokenWebData::TokenWebData(
     scoped_refptr<WebDatabaseService> wdbs,

components/subresource_filter/content/common/ad_delay_throttle.cc

@@ -79,7 +79,7 @@ class NonIsolatedCondition : public AdDelayThrottle::DeferCondition {
   }
 };
 
-};  // namespace
+}  // namespace
 
 AdDelayThrottle::DeferCondition::DeferCondition(
     base::TimeDelta delay,

components/sync/driver/backend_migrator.cc

@@ -206,4 +206,4 @@ ModelTypeSet BackendMigrator::GetPendingMigrationTypesForTest() const {
 
 #undef SLOG
 
-};  // namespace syncer
+}  // namespace syncer

components/sync_sessions/lost_navigations_recorder.h

@@ -53,6 +53,6 @@ class LostNavigationsRecorder : public syncer::LocalChangeObserver {
   std::map<SessionID, id_type> max_recorded_for_tab_;
   DISALLOW_COPY_AND_ASSIGN(LostNavigationsRecorder);
 };
-};  // namespace sync_sessions
+}  // namespace sync_sessions
 
 #endif  // COMPONENTS_SYNC_SESSIONS_LOST_NAVIGATIONS_RECORDER_H_

components/ui_devtools/devtools_base_agent.h

@@ -38,9 +38,9 @@ class UiDevToolsBaseAgent : public UiDevToolsAgent,
 
   // Common methods between all generated Backends, subclasses may
   // choose to override them (but not necessary).
-  protocol::Response enable() override { return protocol::Response::OK(); };
+  protocol::Response enable() override { return protocol::Response::OK(); }
 
-  protocol::Response disable() override { return protocol::Response::OK(); };
+  protocol::Response disable() override { return protocol::Response::OK(); }
 
  protected:
   UiDevToolsBaseAgent() {}

components/ui_devtools/overlay_agent.h

@@ -27,7 +27,7 @@ class UI_DEVTOOLS_EXPORT OverlayAgent
   protocol::Response hideHighlight() override;
 
  protected:
-  DOMAgent* dom_agent() const { return dom_agent_; };
+  DOMAgent* dom_agent() const { return dom_agent_; }
 
  private:
   DOMAgent* const dom_agent_;

components/ui_devtools/ui_element_delegate.h

@@ -15,8 +15,8 @@ class UIElement;
 
 class UIElementDelegate {
  public:
-  UIElementDelegate(){};
+  UIElementDelegate() {}
-  virtual ~UIElementDelegate(){};
+  virtual ~UIElementDelegate() {}
 
   virtual void OnUIElementAdded(UIElement* parent, UIElement* child) = 0;
 

components/ui_devtools/views/overlay_agent_aura.h

@@ -63,7 +63,7 @@ class OverlayAgentAura : public OverlayAgent,
 
   HighlightRectsConfiguration highlight_rect_config() const {
     return highlight_rect_config_;
-  };
+  }
 
   // Return the id of the UI element located at |event|'s root location.
   // The function first searches for the targeted window, then the targeted

components/ui_devtools/views/view_element.h

@@ -22,7 +22,7 @@ class ViewElement : public views::ViewObserver, public UIElement {
               UIElementDelegate* ui_element_delegate,
               UIElement* parent);
   ~ViewElement() override;
-  views::View* view() const { return view_; };
+  views::View* view() const { return view_; }
 
   // views::ViewObserver
   void OnChildViewRemoved(views::View* parent, views::View* view) override;

components/ui_devtools/views/widget_element.h

@@ -25,7 +25,7 @@ class WidgetElement : public views::WidgetRemovalsObserver,
                 UIElementDelegate* ui_element_delegate,
                 UIElement* parent);
   ~WidgetElement() override;
-  views::Widget* widget() const { return widget_; };
+  views::Widget* widget() const { return widget_; }
 
   // views::WidgetRemovalsObserver:
   void OnWillRemoveView(views::Widget* widget, views::View* view) override;

components/ui_devtools/views/window_element.h

@@ -20,7 +20,7 @@ class WindowElement : public aura::WindowObserver, public UIElement {
                 UIElementDelegate* ui_element_delegate,
                 UIElement* parent);
   ~WindowElement() override;
-  aura::Window* window() const { return window_; };
+  aura::Window* window() const { return window_; }
 
   // WindowObserver:
   void OnWindowHierarchyChanging(

components/ui_devtools/viz/dom_agent_viz.h

@@ -36,13 +36,13 @@ class DOMAgentViz : public viz::SurfaceObserver,
   // viz::SurfaceObserver:
   void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
   void OnSurfaceActivated(const viz::SurfaceId& surface_id,
-                          base::Optional<base::TimeDelta> duration) override{};
+                          base::Optional<base::TimeDelta> duration) override {}
-  void OnSurfaceDestroyed(const viz::SurfaceId& surface_id) override{};
+  void OnSurfaceDestroyed(const viz::SurfaceId& surface_id) override {}
   bool OnSurfaceDamaged(const viz::SurfaceId& surface_id,
                         const viz::BeginFrameAck& ack) override;
   void OnSurfaceDiscarded(const viz::SurfaceId& surface_id) override;
   void OnSurfaceDamageExpected(const viz::SurfaceId& surface_id,
-                               const viz::BeginFrameArgs& args) override{};
+                               const viz::BeginFrameArgs& args) override {}
   void OnAddedSurfaceReference(const viz::SurfaceId& parent_id,
                                const viz::SurfaceId& child_id) override;
   void OnRemovedSurfaceReference(const viz::SurfaceId& parent_id,

components/ukm/test_ukm_recorder.cc

@@ -42,8 +42,7 @@ TestUkmRecorder::TestUkmRecorder() {
   DisableSamplingForTesting();
 }
 
-TestUkmRecorder::~TestUkmRecorder() {
+TestUkmRecorder::~TestUkmRecorder() {}
-};
 
 bool TestUkmRecorder::ShouldRestrictToWhitelistedSourceIds() const {
   // In tests, we want to record all source ids (not just those that are
@@ -163,6 +162,6 @@ TestAutoSetUkmRecorder::TestAutoSetUkmRecorder() : self_ptr_factory_(this) {
 
 TestAutoSetUkmRecorder::~TestAutoSetUkmRecorder() {
   DelegatingUkmRecorder::Get()->RemoveDelegate(this);
-};
+}
 
 }  // namespace ukm

components/viz/test/fake_compositor_frame_sink_client.cc

@@ -31,4 +31,4 @@ void FakeCompositorFrameSinkClient::InsertResources(
                              resources.end());
 }
 
-};  // namespace viz
+}  // namespace viz

content/browser/accessibility/one_shot_accessibility_tree_search.h

@@ -64,6 +64,7 @@ DECLARE_ACCESSIBILITY_PREDICATE(AccessibilityUnvisitedLinkPredicate);
 DECLARE_ACCESSIBILITY_PREDICATE(AccessibilityVisitedLinkPredicate);
 DECLARE_ACCESSIBILITY_PREDICATE(AccessibilityTextStyleBoldPredicate);
 
+#undef DECLARE_ACCESSIBILITY_PREDICATE
 
 // This class provides an interface for searching the accessibility tree from
 // a given starting node, with a few built-in options and allowing an arbitrary

content/browser/cache_storage/cache_storage.cc

@@ -237,13 +237,13 @@ class CacheStorage::MemoryLoader : public CacheStorage::CacheLoader {
                           CacheStorageCacheHandle cache_handle) override {
     DCHECK(!base::ContainsKey(cache_handles_, cache_name));
     cache_handles_.insert(std::make_pair(cache_name, std::move(cache_handle)));
-  };
+  }
 
   void NotifyCacheDoomed(CacheStorageCacheHandle cache_handle) override {
     DCHECK(
         base::ContainsKey(cache_handles_, cache_handle.value()->cache_name()));
     cache_handles_.erase(cache_handle.value()->cache_name());
-  };
+  }
 
  private:
   typedef std::map<std::string, CacheStorageCacheHandle> CacheHandles;
@@ -468,7 +468,7 @@ class CacheStorage::SimpleCacheLoader : public CacheStorage::CacheLoader {
         cache_name_to_cache_dir_.find(cache_handle.value()->cache_name());
     doomed_cache_to_path_[cache_handle.value()] = iter->second;
     cache_name_to_cache_dir_.erase(iter);
-  };
+  }
 
  private:
   friend class MigratedLegacyCacheDirectoryNameTest;

content/browser/cache_storage/cache_storage_context_impl.h

@@ -47,7 +47,7 @@ class CONTENT_EXPORT CacheStorageContextImpl : public CacheStorageContext {
                                        const std::string& cache_name) = 0;
 
    protected:
-    virtual ~Observer() {};
+    virtual ~Observer() {}
   };
 
   // Init and Shutdown are for use on the UI thread when the profile,

content/browser/frame_host/navigation_request.h

@@ -157,11 +157,11 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
     return dest_site_instance_.get();
   }
 
-  RestoreType restore_type() const { return restore_type_; };
+  RestoreType restore_type() const { return restore_type_; }
 
-  bool is_view_source() const { return is_view_source_; };
+  bool is_view_source() const { return is_view_source_; }
 
-  int bindings() const { return bindings_; };
+  int bindings() const { return bindings_; }
 
   bool browser_initiated() const { return browser_initiated_ ; }
 

content/browser/frame_host/render_frame_proxy_host.h

@@ -92,7 +92,7 @@ class RenderFrameProxyHost
     return site_instance_.get();
   }
 
-  FrameTreeNode* frame_tree_node() const { return frame_tree_node_; };
+  FrameTreeNode* frame_tree_node() const { return frame_tree_node_; }
 
   // Associates the RenderWidgetHostViewChildFrame |view| with this
   // RenderFrameProxyHost. If |initial_frame_size| isn't specified at this time,

content/browser/indexed_db/indexed_db_context_impl.h

@@ -62,7 +62,7 @@ class CONTENT_EXPORT IndexedDBContextImpl : public IndexedDBContext {
         const base::string16& object_store_name) = 0;
 
    protected:
-    virtual ~Observer() {};
+    virtual ~Observer() {}
   };
 
   // The indexed db directory.

content/browser/indexed_db/leveldb/leveldb_iterator.h

@@ -26,7 +26,7 @@ class CONTENT_EXPORT LevelDBIterator {
   // expense of reloading and seeking later if the iterator is needed again for
   // |Seek*|, |Next|, |Prev|, or |Value|.
   // Cannot be called more than once before the iterator is reloaded.
-  virtual void Detach() {};
+  virtual void Detach() {}
   virtual bool IsDetached() const;
 };
 

content/browser/indexed_db/scopes/scope_lock.cc

@@ -34,7 +34,7 @@ ScopeLock& ScopeLock::operator=(ScopeLock&& other) noexcept {
   this->closure_runner_ = std::move(other.closure_runner_);
   other.is_locked_ = false;
   return *this;
-};
+}
 
 void ScopeLock::Release() {
   if (is_locked_) {

content/browser/loader/detachable_resource_handler.cc

@@ -28,7 +28,7 @@ namespace content {
 class DetachableResourceHandler::Controller : public ResourceController {
  public:
   explicit Controller(DetachableResourceHandler* detachable_handler)
-      : detachable_handler_(detachable_handler){};
+      : detachable_handler_(detachable_handler) {}
 
   ~Controller() override {}
 

content/browser/loader/resource_controller.h

@@ -10,7 +10,7 @@
 
 namespace net {
 class HttpRequestHeaders;
-};
+}
 
 namespace content {
 

content/browser/loader/resource_loader.cc

@@ -146,7 +146,7 @@ void PopulateResourceResponse(
 class ResourceLoader::Controller : public ResourceController {
  public:
   explicit Controller(ResourceLoader* resource_loader)
-      : resource_loader_(resource_loader){};
+      : resource_loader_(resource_loader) {}
 
   ~Controller() override {}
 

content/browser/media/audio_muting_session.cc

@@ -9,7 +9,7 @@ namespace content {
 AudioMutingSession::AudioMutingSession(const base::UnguessableToken& group_id)
     : group_id_(group_id) {}
 
-AudioMutingSession::~AudioMutingSession(){};
+AudioMutingSession::~AudioMutingSession() {}
 
 void AudioMutingSession::Connect(audio::mojom::StreamFactory* factory) {
   if (muter_)

content/browser/media/flinging_renderer.cc

@@ -22,7 +22,7 @@ FlingingRenderer::FlingingRenderer(
 
 FlingingRenderer::~FlingingRenderer() {
   controller_->RemoveMediaStatusObserver(this);
-};
+}
 
 // static
 std::unique_ptr<FlingingRenderer> FlingingRenderer::Create(

content/browser/media/midi_host.cc

@@ -249,6 +249,6 @@ void MidiHost::EndSession() {
     midi_service_->EndSession(this);
   midi_client_.reset();
   midi_session_.Close();
-};
+}
 
 }  // namespace content

content/browser/renderer_host/pepper/pepper_truetype_font.h

@@ -49,7 +49,7 @@ class PepperTrueTypeFont
 
  protected:
   friend class base::RefCountedThreadSafe<PepperTrueTypeFont>;
-  virtual ~PepperTrueTypeFont() {};
+  virtual ~PepperTrueTypeFont() {}
 };
 
 }  // namespace content

content/browser/renderer_host/render_widget_host_view_child_frame.h

@@ -135,7 +135,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   // Since the URL of content rendered by this class is not displayed in
   // the URL bar, this method does not need an implementation.
   void ClearCompositorFrame() override {}
-  void ResetFallbackToFirstNavigationSurface() override{};
+  void ResetFallbackToFirstNavigationSurface() override {}
 
   void TransformPointToRootSurface(gfx::PointF* point) override;
   gfx::Rect GetBoundsInRootWindow() override;

content/browser/service_worker/service_worker_installed_script_reader.cc

@@ -273,4 +273,4 @@ void ServiceWorkerInstalledScriptReader::CompleteSendIfNeeded(
     client_->OnFinished(reason);
 }
 
-};  // namespace content
+}  // namespace content

content/browser/service_worker/service_worker_navigation_loader.cc

@@ -125,7 +125,7 @@ ServiceWorkerNavigationLoader::~ServiceWorkerNavigationLoader() {
       "ServiceWorker",
       "ServiceWorkerNavigationLoader::~ServiceWorkerNavigationloader", this,
       TRACE_EVENT_FLAG_FLOW_IN);
-};
+}
 
 void ServiceWorkerNavigationLoader::FallbackToNetwork() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);

content/browser/service_worker/service_worker_version.cc

@@ -2121,7 +2121,7 @@ void ServiceWorkerVersion::set_compared_script_info_map(
     std::map<GURL, ServiceWorkerUpdateChecker::ComparedScriptInfo>
         compared_script_info_map) {
   compared_script_info_map_ = std::move(compared_script_info_map);
-};
+}
 
 const std::map<GURL, ServiceWorkerUpdateChecker::ComparedScriptInfo>&
 ServiceWorkerVersion::compared_script_info_map() const {

content/browser/utility_process_host_client.h

@@ -36,6 +36,6 @@ class UtilityProcessHostClient
   virtual ~UtilityProcessHostClient() {}
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_UTILITY_PROCESS_HOST_CLIENT_H_

content/browser/web_package/signed_exchange_envelope.h

@@ -59,7 +59,7 @@ class CONTENT_EXPORT SignedExchangeEnvelope {
 
   const signed_exchange_utils::URLWithRawString& request_url() const {
     return request_url_;
-  };
+  }
   void set_request_url(const signed_exchange_utils::URLWithRawString& url) {
     request_url_ = url;
   }

content/browser/web_package/signed_exchange_loader.h

@@ -92,7 +92,7 @@ class CONTENT_EXPORT SignedExchangeLoader final
 
   void ConnectToClient(network::mojom::URLLoaderClientPtr client);
 
-  const base::Optional<GURL>& fallback_url() const { return fallback_url_; };
+  const base::Optional<GURL>& fallback_url() const { return fallback_url_; }
 
   const base::Optional<GURL>& inner_request_url() const {
     return inner_request_url_;

content/child/child_process_sandbox_support_impl_linux.h

@@ -72,6 +72,6 @@ class WebSandboxSupportLinux : public blink::WebSandboxSupport {
   DISALLOW_COPY_AND_ASSIGN(WebSandboxSupportLinux);
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_PROCESS_SANDBOX_SUPPORT_IMPL_LINUX_H_

content/common/content_security_policy/csp_source_list.cc

@@ -19,7 +19,7 @@ bool AllowFromSources(const GURL& url,
   return false;
 }
 
-};  // namespace
+}  // namespace
 
 CSPSourceList::CSPSourceList()
     : allow_self(false),

content/common/drag_event_source_info.h

@@ -17,6 +17,6 @@ struct CONTENT_EXPORT DragEventSourceInfo {
   ui::DragDropTypes::DragEventSource event_source;
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_COMMON_DRAG_EVENT_SOURCE_INFO_H_

content/public/browser/background_sync_controller.h

@@ -24,7 +24,7 @@ class CONTENT_EXPORT BackgroundSyncController {
   // background sync. Note that disable can be overridden from false to true
   // but overrides from true to false will be ignored.
   virtual void GetParameterOverrides(
-      BackgroundSyncParameters* parameters) const {};
+      BackgroundSyncParameters* parameters) const {}
 
   // Notification that a service worker registration with origin |origin| just
   // registered a background sync event.

content/public/browser/browser_associated_interface.h

@@ -110,6 +110,6 @@ class BrowserAssociatedInterface {
   DISALLOW_COPY_AND_ASSIGN(BrowserAssociatedInterface);
 };
 
-};
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_

content/public/browser/browser_child_process_host.h

@@ -105,6 +105,6 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender {
 #endif
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_

content/public/browser/browser_child_process_host_delegate.h

@@ -28,6 +28,6 @@ class CONTENT_EXPORT BrowserChildProcessHostDelegate : public IPC::Listener {
   virtual void OnProcessCrashed(int exit_code) {}
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CHILD_PROCESS_HOST_DELEGATE_H_

content/public/browser/browser_child_process_host_iterator.h

@@ -62,6 +62,6 @@ class CONTENT_EXPORT BrowserChildProcessHostTypeIterator
   }
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CHILD_PROCESS_HOST_ITERATOR_H_

content/public/browser/gpu_data_manager.h

@@ -74,6 +74,6 @@ class GpuDataManager {
   virtual ~GpuDataManager() {}
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_GPU_DATA_MANAGER_H_

content/public/browser/gpu_data_manager_observer.h

@@ -24,6 +24,6 @@ class CONTENT_EXPORT GpuDataManagerObserver {
   virtual ~GpuDataManagerObserver() {}
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_GPU_DATA_MANAGER_OBSERVER_H_

content/public/browser/navigation_data.h

@@ -14,7 +14,7 @@ namespace content {
 // UI thread as a clone.
 class NavigationData {
  public:
-  virtual ~NavigationData(){};
+  virtual ~NavigationData() {}
 
   // Creates a new NavigationData that is a deep copy of the original
   virtual std::unique_ptr<NavigationData> Clone() const = 0;

content/public/browser/permission_controller.h

@@ -24,7 +24,7 @@ class CONTENT_EXPORT PermissionController
   // cancelling/unsubscribing at a later stage would have no effect.
   static const int kNoPendingOperation = -1;
 
-  ~PermissionController() override{};
+  ~PermissionController() override {}
 
   // Returns the permission status of a given requesting_origin/embedding_origin
   // tuple. This is not taking a RenderFrameHost because the call might happen

content/public/browser/web_contents_user_data.h

@@ -10,7 +10,7 @@
 #include "base/supports_user_data.h"
 #include "content/public/browser/web_contents.h"
 
-#define WEB_CONTENTS_USER_DATA_KEY_DECL() static constexpr int kUserDataKey = 0;
+#define WEB_CONTENTS_USER_DATA_KEY_DECL() static constexpr int kUserDataKey = 0
 
 #define WEB_CONTENTS_USER_DATA_KEY_IMPL(Type) const int Type::kUserDataKey;
 

content/public/common/child_process_host_delegate.h

@@ -39,6 +39,6 @@ class ChildProcessHostDelegate : public IPC::Listener {
                              mojo::ScopedMessagePipeHandle interface_pipe) {}
 };
 
-};  // namespace content
+}  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CHILD_PROCESS_HOST_DELEGATE_H_

content/public/common/referrer_type_converters.cc

@@ -11,7 +11,7 @@ blink::mojom::ReferrerPtr
 TypeConverter<blink::mojom::ReferrerPtr, content::Referrer>::Convert(
     const content::Referrer& input) {
   return blink::mojom::Referrer::New(input.url, input.policy);
-};
+}
 
 // static
 content::Referrer
@@ -20,6 +20,6 @@ TypeConverter<content::Referrer, blink::mojom::ReferrerPtr>::Convert(
   if (!input)
     return content::Referrer();
   return content::Referrer(input->url, input->policy);
-};
+}
 
 }  // namespace mojo

content/public/renderer/worker_thread.h

@@ -45,7 +45,7 @@ class CONTENT_EXPORT WorkerThread {
   static void PostTask(int id, base::OnceClosure task);
 
  private:
-  WorkerThread(){};
+  WorkerThread() {}
   DISALLOW_COPY_AND_ASSIGN(WorkerThread);
 };
 

content/renderer/accessibility/render_accessibility_impl.h

@@ -24,7 +24,7 @@
 namespace blink {
 class WebDocument;
 class WebNode;
-};
+}  // namespace blink
 
 namespace ui {
 struct AXActionData;

content/renderer/categorized_worker_pool.cc

@@ -126,7 +126,7 @@ class CategorizedWorkerPool::CategorizedWorkerPoolSequencedTaskRunner
     task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
     task_graph_runner_->CollectCompletedTasks(namespace_token_,
                                               &completed_tasks_);
-  };
+  }
 
   // Lock to exclusively access all the following members that are used to
   // implement the SequencedTaskRunner interfaces.

content/renderer/frame_swap_message_queue.h

@@ -19,7 +19,7 @@
 
 namespace IPC {
 class Message;
-};
+}
 
 namespace content {
 

content/renderer/input/widget_input_handler_manager.h

@@ -18,8 +18,8 @@
 namespace blink {
 namespace scheduler {
 class WebThreadScheduler;
-};  // namespace scheduler
+}  // namespace scheduler
-};  // namespace blink
+}  // namespace blink
 
 namespace content {
 class MainThreadEventQueue;

content/renderer/media/webrtc/rtc_video_decoder.h

@@ -31,7 +31,7 @@
 
 namespace base {
 class WaitableEvent;
-};  // namespace base
+}  // namespace base
 
 namespace media {
 class GpuVideoAcceleratorFactories;

content/renderer/p2p/socket_client.h

@@ -14,7 +14,7 @@
 
 namespace rtc {
 struct PacketOptions;
-};
+}
 
 namespace content {
 

content/renderer/pepper/ppb_image_data_impl.h

@@ -38,7 +38,7 @@ class CONTENT_EXPORT PPB_ImageData_Impl
   // it cheap & easy to implement Swap.
   class Backend {
    public:
-    virtual ~Backend() {};
+    virtual ~Backend() {}
     virtual bool Init(PPB_ImageData_Impl* impl,
                       PP_ImageDataFormat format,
                       int width,

content/renderer/service_worker/service_worker_timeout_timer.cc

@@ -74,7 +74,7 @@ ServiceWorkerTimeoutTimer::~ServiceWorkerTimeoutTimer() {
   // Abort all callbacks.
   for (auto& event : inflight_events_)
     std::move(event.abort_callback).Run();
-};
+}
 
 int ServiceWorkerTimeoutTimer::StartEvent(
     base::OnceCallback<void(int /* event_id */)> abort_callback) {

device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc

@@ -86,7 +86,7 @@ BluetoothLocalGattServiceBlueZ::GetCharacteristic(
     const std::string& identifier) {
   const auto& service = characteristics_.find(dbus::ObjectPath(identifier));
   return service == characteristics_.end() ? nullptr : service->second.get();
-};
+}
 
 const std::map<dbus::ObjectPath,
                std::unique_ptr<BluetoothLocalGattCharacteristicBlueZ>>&

device/fido/fido_request_handler_base.h

@@ -26,7 +26,7 @@
 
 namespace service_manager {
 class Connector;
-};  // namespace service_manager
+}  // namespace service_manager
 
 namespace device {