Fix -Wextra-semi warnings after USING_GARBAGE_COLLECTED_MIXIN(...).

Bug: 926235
Change-Id: I2395e88034df3c9a05441e8f403a05806163fff5
Reviewed-on: https://chromium-review.googlesource.com/c/1461321
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630639}

third_party/blink/renderer/core/context_features/context_feature_settings.h

@@ -19,7 +19,8 @@ class ExecutionContext;
 class CORE_EXPORT ContextFeatureSettings final
     : public GarbageCollectedFinalized<ContextFeatureSettings>,
       public Supplement<ExecutionContext> {
-  USING_GARBAGE_COLLECTED_MIXIN(ContextFeatureSettings)
+  USING_GARBAGE_COLLECTED_MIXIN(ContextFeatureSettings);
+
  public:
   static const char kSupplementName[];
 

third_party/blink/renderer/core/fetch/fetch_data_loader.cc

@@ -116,7 +116,8 @@ class FetchDataLoaderAsBlobHandle final : public FetchDataLoader,
 
 class FetchDataLoaderAsArrayBuffer final : public FetchDataLoader,
                                            public BytesConsumer::Client {
-  USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsArrayBuffer)
+  USING_GARBAGE_COLLECTED_MIXIN(FetchDataLoaderAsArrayBuffer);
+
  public:
   void Start(BytesConsumer* consumer,
              FetchDataLoader::Client* client) override {

third_party/blink/renderer/core/frame/reporting_context.h

@@ -21,7 +21,8 @@ class ReportingObserver;
 class CORE_EXPORT ReportingContext final
     : public GarbageCollectedFinalized<ReportingContext>,
       public Supplement<ExecutionContext> {
-  USING_GARBAGE_COLLECTED_MIXIN(ReportingContext)
+  USING_GARBAGE_COLLECTED_MIXIN(ReportingContext);
+
  public:
   static const char kSupplementName[];
 

third_party/blink/renderer/core/html/media/video_wake_lock.h

@@ -28,7 +28,7 @@ class HTMLVideoElement;
 class CORE_EXPORT VideoWakeLock final : public NativeEventListener,
                                         public PageVisibilityObserver,
                                         public RemotePlaybackObserver {
-  USING_GARBAGE_COLLECTED_MIXIN(VideoWakeLock)
+  USING_GARBAGE_COLLECTED_MIXIN(VideoWakeLock);
 
  public:
   explicit VideoWakeLock(HTMLVideoElement&);

third_party/blink/renderer/core/origin_trials/origin_trial_context.h

@@ -35,7 +35,8 @@ class ExecutionContext;
 class CORE_EXPORT OriginTrialContext final
     : public GarbageCollectedFinalized<OriginTrialContext>,
       public Supplement<ExecutionContext> {
-  USING_GARBAGE_COLLECTED_MIXIN(OriginTrialContext)
+  USING_GARBAGE_COLLECTED_MIXIN(OriginTrialContext);
+
  public:
   static const char kSupplementName[];
 

third_party/blink/renderer/core/page/chrome_client_impl_test.cc

@@ -109,7 +109,7 @@ class FakeColorChooserClient
     ColorChooserClient::Trace(visitor);
   }
 
-  USING_GARBAGE_COLLECTED_MIXIN(FakeColorChooserClient)
+  USING_GARBAGE_COLLECTED_MIXIN(FakeColorChooserClient);
 
   // ColorChooserClient
   void DidChooseColor(const Color& color) override {}
@@ -139,7 +139,7 @@ class FakeDateTimeChooserClient
     DateTimeChooserClient::Trace(visitor);
   }
 
-  USING_GARBAGE_COLLECTED_MIXIN(FakeDateTimeChooserClient)
+  USING_GARBAGE_COLLECTED_MIXIN(FakeDateTimeChooserClient);
 
   // DateTimeChooserClient
   Element& OwnerElement() const override { return *owner_element_; }

third_party/blink/renderer/modules/mediastream/navigator_user_media.h

@@ -16,7 +16,8 @@ class MediaDevices;
 
 class NavigatorUserMedia final : public GarbageCollected<NavigatorUserMedia>,
                                  public Supplement<Navigator> {
-  USING_GARBAGE_COLLECTED_MIXIN(NavigatorUserMedia)
+  USING_GARBAGE_COLLECTED_MIXIN(NavigatorUserMedia);
+
  public:
   static const char kSupplementName[];
 

third_party/blink/renderer/modules/payments/payment_request.h

@@ -45,7 +45,7 @@ class MODULES_EXPORT PaymentRequest final
       public ContextLifecycleObserver,
       public ActiveScriptWrappable<PaymentRequest> {
   DEFINE_WRAPPERTYPEINFO();
-  USING_GARBAGE_COLLECTED_MIXIN(PaymentRequest)
+  USING_GARBAGE_COLLECTED_MIXIN(PaymentRequest);
   WTF_MAKE_NONCOPYABLE(PaymentRequest);
 
  public:

third_party/blink/renderer/modules/payments/payment_request_update_event.h

@@ -23,7 +23,7 @@ class ScriptState;
 class MODULES_EXPORT PaymentRequestUpdateEvent : public Event,
                                                  public PaymentUpdater {
   DEFINE_WRAPPERTYPEINFO();
-  USING_GARBAGE_COLLECTED_MIXIN(PaymentRequestUpdateEvent)
+  USING_GARBAGE_COLLECTED_MIXIN(PaymentRequestUpdateEvent);
 
  public:
   PaymentRequestUpdateEvent(ExecutionContext*,

third_party/blink/renderer/modules/websockets/web_pepper_socket_channel_client_proxy.h

@@ -23,7 +23,8 @@ namespace blink {
 class WebPepperSocketChannelClientProxy final
     : public GarbageCollectedFinalized<WebPepperSocketChannelClientProxy>,
       public WebSocketChannelClient {
-  USING_GARBAGE_COLLECTED_MIXIN(WebPepperSocketChannelClientProxy)
+  USING_GARBAGE_COLLECTED_MIXIN(WebPepperSocketChannelClientProxy);
+
  public:
   static WebPepperSocketChannelClientProxy* Create(WebPepperSocketImpl* impl) {
     return MakeGarbageCollected<WebPepperSocketChannelClientProxy>(impl);

third_party/blink/renderer/platform/heap/garbage_collected.h

@@ -146,10 +146,10 @@ class PLATFORM_EXPORT GarbageCollectedMixin {
 
 // The USING_GARBAGE_COLLECTED_MIXIN macro defines all methods and markers
 // needed for handling mixins.
-#define USING_GARBAGE_COLLECTED_MIXIN(TYPE)    \
-  IS_GARBAGE_COLLECTED_TYPE();                 \
-  DEFINE_GARBAGE_COLLECTED_MIXIN_METHODS(TYPE) \
-  DEFINE_GARBAGE_COLLECTED_MIXIN_CONSTRUCTOR_MARKER(TYPE)
+#define USING_GARBAGE_COLLECTED_MIXIN(TYPE)               \
+  DEFINE_GARBAGE_COLLECTED_MIXIN_CONSTRUCTOR_MARKER(TYPE) \
+  DEFINE_GARBAGE_COLLECTED_MIXIN_METHODS(TYPE)            \
+  IS_GARBAGE_COLLECTED_TYPE()
 
 // Merge two or more Mixins into one:
 //

third_party/blink/renderer/platform/heap/heap_test.cc

@@ -1379,7 +1379,8 @@ class Mixin : public GarbageCollectedMixin {
 };
 
 class UseMixin : public SimpleObject, public Mixin {
-  USING_GARBAGE_COLLECTED_MIXIN(UseMixin)
+  USING_GARBAGE_COLLECTED_MIXIN(UseMixin);
+
  public:
   static UseMixin* Create() { return MakeGarbageCollected<UseMixin>(); }
 

tools/clang/blink_gc_plugin/tests/heap/stubs.h

@@ -196,13 +196,13 @@ using namespace WTF;
  public:                                                                \
   virtual void AdjustAndMark(Visitor*) const override {}                \
   virtual bool IsHeapObjectAlive(Visitor*) const override { return 0; } \
-  void* mixin_constructor_marker_;
+  void* mixin_constructor_marker_
 
 #define USING_GARBAGE_COLLECTED_MIXIN_NEW(type)                         \
  public:                                                                \
   virtual void AdjustAndMark(Visitor*) const override {}                \
   virtual bool IsHeapObjectAlive(Visitor*) const override { return 0; } \
-  typedef int HasUsingGarbageCollectedMixinMacro;
+  typedef int HasUsingGarbageCollectedMixinMacro
 
 #define EAGERLY_FINALIZED() typedef int IsEagerlyFinalizedMarker