Remove most remaining semicolons in a release win build.

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

base/win/event_trace_controller.cc

@@ -144,7 +144,7 @@ HRESULT EtwTraceController::Query(const wchar_t* session_name,
   ULONG err = ::ControlTrace(NULL, session_name, properties->get(),
                              EVENT_TRACE_CONTROL_QUERY);
   return HRESULT_FROM_WIN32(err);
-};
+}
 
 HRESULT EtwTraceController::Update(const wchar_t* session_name,
     EtwTraceProperties* properties) {

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

@@ -2257,11 +2257,11 @@ class BookmarkBarViewTest25 : public BookmarkBarViewEventTestBase {
 
 // Tests that pressing F10 system key closes the menu.
 using BookmarkBarViewTest25F10 = BookmarkBarViewTest25<ui::VKEY_F10>;
-VIEW_TEST(BookmarkBarViewTest25F10, F10ClosesMenu);
+VIEW_TEST(BookmarkBarViewTest25F10, F10ClosesMenu)
 
 // Tests that pressing Alt system key closes the menu.
 using BookmarkBarViewTest25Alt = BookmarkBarViewTest25<ui::VKEY_MENU>;
-VIEW_TEST(BookmarkBarViewTest25Alt, AltClosesMenu);
+VIEW_TEST(BookmarkBarViewTest25Alt, AltClosesMenu)
 
 // Tests that WM_CANCELMODE closes the menu.
 class BookmarkBarViewTest26 : public BookmarkBarViewEventTestBase {
@@ -2304,7 +2304,7 @@ class BookmarkBarViewTest26 : public BookmarkBarViewEventTestBase {
   }
 };
 
-VIEW_TEST(BookmarkBarViewTest26, CancelModeClosesMenu);
+VIEW_TEST(BookmarkBarViewTest26, CancelModeClosesMenu)
 #endif
 
 class BookmarkBarViewTest27 : public BookmarkBarViewEventTestBase {

chrome/credential_provider/test/com_fakes.cc

@@ -58,7 +58,7 @@ FakeCredentialProviderUser::GetValue(REFPROPERTYKEY key, PROPVARIANT* value) {
   return E_NOTIMPL;
 }
 
-IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderUser);
+IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderUser)
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -88,7 +88,7 @@ HRESULT FakeCredentialProviderUserArray::GetAt(DWORD index,
   return S_OK;
 }
 
-IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderUserArray);
+IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderUserArray)
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -102,7 +102,7 @@ HRESULT FakeCredentialProviderEvents::CredentialsChanged(
   return S_OK;
 }
 
-IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderEvents);
+IMPL_IUNKOWN_NOQI_NOREF(FakeCredentialProviderEvents)
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -129,6 +129,6 @@ HRESULT FakeGaiaCredentialProvider::OnUserAuthenticated(
   return S_OK;
 }
 
-IMPL_IUNKOWN_NOQI_NOREF(FakeGaiaCredentialProvider);
+IMPL_IUNKOWN_NOQI_NOREF(FakeGaiaCredentialProvider)
 
 }  // namespace credential_provider

chrome/installer/util/create_dir_work_item_unittest.cc

@@ -16,13 +16,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-  class CreateDirWorkItemTest : public testing::Test {
+class CreateDirWorkItemTest : public testing::Test {
-   protected:
+ protected:
-    void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
+  void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
 
-    base::ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
-  };
 };
+}  // namespace
 
 TEST_F(CreateDirWorkItemTest, CreatePath) {
   base::FilePath parent_dir(temp_dir_.GetPath());

chrome/installer/util/duplicate_tree_detector_unittest.cc

@@ -75,7 +75,7 @@ const wchar_t DuplicateTreeDetectorTest::text_content_2_[] =
 const wchar_t DuplicateTreeDetectorTest::text_content_3_[] =
     L"I'd rather see your watermelon and raise you ham and a half.";
 
-};  // namespace
+}  // namespace
 
 // Test the DuplicateTreeChecker's definition of identity on two identical
 // directory structures.

chrome/installer/util/firewall_manager_win.cc

@@ -34,7 +34,7 @@ class FirewallManagerAdvancedImpl : public FirewallManager {
   // FirewallManager methods.
   bool CanUseLocalPorts() override {
     return !manager_.IsFirewallEnabled() || manager_.HasAnyRule();
-  };
+  }
 
   bool AddFirewallRules() override {
     return manager_.AddUDPRule(GetMdnsRuleName(), GetMdnsRuleDescription(),

chrome/installer/util/move_tree_work_item_unittest.cc

@@ -54,7 +54,7 @@ std::wstring ReadTextFile(const base::FilePath& path) {
 
 const wchar_t kTextContent1[] = L"Gooooooooooooooooooooogle";
 const wchar_t kTextContent2[] = L"Overwrite Me";
-};  // namespace
+}  // namespace
 
 // Move one directory from source to destination when destination does not
 // exist.

chrome_elf/nt_registry/nt_registry.cc

@@ -1223,4 +1223,4 @@ std::wstring GetTestingOverride(ROOT_KEY root) {
   return g_HKLM_override;
 }
 
-};  // namespace nt
+}  // namespace nt

chrome_elf/nt_registry/nt_registry.h

@@ -262,6 +262,6 @@ bool SetTestingOverride(ROOT_KEY root, const std::wstring& new_path);
 // Getter function for test suites that use reg redirection.
 std::wstring GetTestingOverride(ROOT_KEY root);
 
-};  // namespace nt
+}  // namespace nt
 
 #endif  // CHROME_ELF_NT_REGISTRY_NT_REGISTRY_H_

content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc

@@ -85,7 +85,7 @@ bool ExtractCaseFoldedLocalizedStrings(
 class ScopedAutoSignal {
  public:
   ScopedAutoSignal(base::WaitableEvent* waitable_event)
-      : waitable_event_(waitable_event){};
+      : waitable_event_(waitable_event) {}
   ~ScopedAutoSignal() { waitable_event_->Signal(); }
 
  private:
@@ -99,7 +99,7 @@ class ScopedAutoSignal {
 DWriteFontLookupTableBuilder::FontFileWithUniqueNames::FontFileWithUniqueNames(
     blink::FontUniqueNameTable_UniqueFont&& font,
     std::vector<std::string>&& names)
-    : font_entry(std::move(font)), extracted_names(std::move(names)){};
+    : font_entry(std::move(font)), extracted_names(std::move(names)) {}
 
 DWriteFontLookupTableBuilder::FontFileWithUniqueNames::
     ~FontFileWithUniqueNames() = default;

content/browser/renderer_host/legacy_render_widget_host_win.h

@@ -60,7 +60,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
                               ATL::CWindow,
                               ATL::CWinTraits<WS_CHILD>> {
  public:
-  DECLARE_WND_CLASS_EX(L"Chrome_RenderWidgetHostHWND", CS_DBLCLKS, 0);
+  DECLARE_WND_CLASS_EX(L"Chrome_RenderWidgetHostHWND", CS_DBLCLKS, 0)
 
   typedef ATL::CWindowImpl<LegacyRenderWidgetHostHWND,
                            ATL::CWindow,

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -6772,7 +6772,7 @@ class RenderWidgetHostViewAuraKeyboardTest
     : public RenderWidgetHostViewAuraTest {
  public:
   RenderWidgetHostViewAuraKeyboardTest() = default;
-  ~RenderWidgetHostViewAuraKeyboardTest() override{};
+  ~RenderWidgetHostViewAuraKeyboardTest() override {}
   void SetUp() override {
     input_method_ = new RenderWidgetHostViewAuraKeyboardMockInputMethod();
     // transfers ownership.

content/test/dwrite_font_fake_sender_win.cc

@@ -129,7 +129,7 @@ void FakeFontCollection::MapCharacters(
 }
 
 void FakeFontCollection::GetUniqueNameLookupTable(
-    GetUniqueNameLookupTableCallback callback){};
+    GetUniqueNameLookupTableCallback callback) {}
 
 FakeFontCollection::~FakeFontCollection() = default;
 

device/bluetooth/test/bluetooth_test_win.cc

@@ -161,7 +161,7 @@ class TestBluetoothAdapterWinrt : public BluetoothAdapterWinrt {
       IBluetoothAdapterStatics** statics) const override {
     auto adapter_statics = Make<FakeBluetoothAdapterStaticsWinrt>(adapter_);
     return adapter_statics.CopyTo(statics);
-  };
+  }
 
   HRESULT
   GetDeviceInformationStaticsActivationFactory(
@@ -169,7 +169,7 @@ class TestBluetoothAdapterWinrt : public BluetoothAdapterWinrt {
     auto device_information_statics =
         Make<FakeDeviceInformationStaticsWinrt>(device_information_);
     return device_information_statics.CopyTo(statics);
-  };
+  }
 
   HRESULT ActivateBluetoothAdvertisementLEWatcherInstance(
       IBluetoothLEAdvertisementWatcher** instance) const override {

device/fido/win/fake_webauthn_api.cc

@@ -58,7 +58,7 @@ HRESULT FakeWinWebAuthnApi::CancelCurrentOperation(GUID* cancellation_id) {
 const wchar_t* FakeWinWebAuthnApi::GetErrorName(HRESULT hr) {
   DCHECK(is_available_);
   return L"not implemented";
-};
+}
 
 ScopedFakeWinWebAuthnApi::ScopedFakeWinWebAuthnApi() : FakeWinWebAuthnApi() {
   WinWebAuthnApi::SetDefaultForTesting(this);

device/fido/win/type_conversions_unittest.cc

@@ -126,7 +126,7 @@ TEST(TypeConversionsTest, ToAuthenticatorMakeCredentialResponse) {
               test.cbor_attestation_statement);
     EXPECT_EQ(response->transport_used(), test.expected_transport);
   }
-};
+}
 
 }  // namespace
 }  // namespace device

device/fido/win/webauthn_api.cc

@@ -152,7 +152,7 @@ class WinWebAuthnApiImpl : public WinWebAuthnApi {
   const wchar_t* GetErrorName(HRESULT hr) override {
     DCHECK(is_bound_);
     return get_error_name_(hr);
-  };
+  }
 
  private:
   std::pair<HRESULT, ScopedCredentialAttestation>

device/vr/windows/compositor_base.cc

@@ -24,7 +24,7 @@ void XRDeviceAbstraction::OnSessionStart() {}
 void XRDeviceAbstraction::HandleDeviceLost() {}
 bool XRDeviceAbstraction::PreComposite() {
   return true;
-};
+}
 void XRDeviceAbstraction::OnLayerBoundsChanged() {}
 
 XRCompositorCommon::OutstandingFrame::OutstandingFrame() = default;
@@ -154,7 +154,7 @@ void XRCompositorCommon::UpdateLayerBounds(int16_t frame_id,
   source_size_ = source_size;
 
   OnLayerBoundsChanged();
-};
+}
 
 void XRCompositorCommon::RequestSession(
     base::OnceCallback<void()> on_presentation_ended,

media/capture/video/win/sink_filter_win.h

@@ -38,7 +38,6 @@ const GUID kMediaSubTypeHDYC = {
     0x0000,
     0x0010,
     {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-;
 
 // 16-bit grey-scale single plane formats provided by some depth cameras.
 const GUID kMediaSubTypeZ16 = {

media/gpu/windows/d3d11_vp9_picture.h

@@ -17,9 +17,9 @@ class D3D11VP9Picture : public VP9Picture {
  public:
   explicit D3D11VP9Picture(D3D11PictureBuffer* picture_buffer);
 
-  D3D11PictureBuffer* picture_buffer() const { return picture_buffer_; };
+  D3D11PictureBuffer* picture_buffer() const { return picture_buffer_; }
 
-  size_t level() const { return level_; };
+  size_t level() const { return level_; }
 
  protected:
   ~D3D11VP9Picture() override;

rlz/win/lib/process_info.cc

@@ -82,4 +82,4 @@ bool ProcessInfo::HasAdminRights() {
   return has_rights;
 }
 
-};  // namespace
+}  // namespace rlz_lib

rlz/win/lib/process_info.h

@@ -20,6 +20,6 @@ class ProcessInfo {
  private:
   DISALLOW_COPY_AND_ASSIGN(ProcessInfo);
 };  // class
-};  // namespace
+}  // namespace rlz_lib
 
 #endif  // RLZ_WIN_LIB_PROCESS_INFO_H_

sandbox/win/src/job.cc

@@ -12,9 +12,9 @@
 
 namespace sandbox {
 
-Job::Job() : job_handle_(nullptr){};
+Job::Job() : job_handle_(nullptr) {}
 
-Job::~Job(){};
+Job::~Job() {}
 
 DWORD Job::Init(JobLevel security_level,
                 const wchar_t* job_name,

sandbox/win/src/policy_engine_params.h

@@ -160,7 +160,7 @@ class ParameterSetEx<UNICODE_STRING> : public ParameterSet {
 template <typename T>
 ParameterSet ParamPickerMake(T& parameter) {
   return ParameterSetEx<T>(&parameter);
-};
+}
 
 struct CountedParameterSetBase {
   size_t count;

sandbox/win/src/resolver_64.cc

@@ -31,7 +31,7 @@ struct InternalThunk {
     mov_rax = kMovRax;
     jmp_rax = kJmpRax;
     interceptor_function = 0;
-  };
+  }
   USHORT mov_rax;  // = 48 B8
   ULONG_PTR interceptor_function;
   USHORT jmp_rax;  // = ff e0

sandbox/win/src/service_resolver_64.cc

@@ -168,7 +168,7 @@ bool IsAnyService(const void* source) {
 #error "Unsupported Windows 64-bit Arch"
 #endif
 
-};  // namespace
+}  // namespace
 
 namespace sandbox {
 

sandbox/win/src/service_resolver_unittest.cc

@@ -62,7 +62,7 @@ class ResolverThunkTestImpl : public T, public ResolverThunkTest {
     this->target_ = fake_target_;
 
     return ret;
-  };
+  }
 
   DISALLOW_COPY_AND_ASSIGN(ResolverThunkTestImpl);
 };

sandbox/win/src/target_process.h

@@ -25,8 +25,8 @@ namespace win {
 
 class StartupInformation;
 
-};  // namespace win
+}  // namespace win
-};  // namespace base
+}  // namespace base
 
 namespace sandbox {
 

sandbox/win/src/win_utils.cc

@@ -516,7 +516,7 @@ void* GetProcessBaseAddress(HANDLE process) {
   return base_address;
 }
 
-};  // namespace sandbox
+}  // namespace sandbox
 
 void ResolveNTFunctionPtr(const char* name, void* ptr) {
   static volatile HMODULE ntdll = nullptr;

ui/events/devices/input_device_observer_win.cc

@@ -82,9 +82,9 @@ void InputDeviceObserverWin::RemoveObserver(
 }
 
 WIN_NOTIFY_OBSERVERS(NotifyObserversKeyboardDeviceConfigurationChanged(),
-                     kKeyboard);
+                     kKeyboard)
 
 WIN_NOTIFY_OBSERVERS(NotifyObserversTouchpadDeviceConfigurationChanged(),
-                     kTouchpad);
+                     kTouchpad)
 
 }  // namespace ui