0

Remove all remaining semicolons in a release mac build.

Bug: 926235
Change-Id: I20c96005e0a87f7487811a282247b7193b4fdbdf
Reviewed-on: https://chromium-review.googlesource.com/c/1483253
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634735}
This commit is contained in:
Nico Weber
2019-02-22 18:11:12 +00:00
committed by Commit Bot
parent 0b10a683d7
commit e86ed9b39c
24 changed files with 27 additions and 27 deletions

@@ -31,7 +31,7 @@ void RegisterBrowserCrApp() {
// will not be a BrowserCrApplication, but will instead be an NSApplication. // will not be a BrowserCrApplication, but will instead be an NSApplication.
// This is undesirable and we must enforce that this doesn't happen. // This is undesirable and we must enforce that this doesn't happen.
CHECK([NSApp isKindOfClass:[BrowserCrApplication class]]); CHECK([NSApp isKindOfClass:[BrowserCrApplication class]]);
}; }
void Terminate() { void Terminate() {
[NSApp terminate:nil]; [NSApp terminate:nil];

@@ -13,7 +13,7 @@ HandoffActiveURLObserverBridge::HandoffActiveURLObserverBridge(
observer_.reset(new HandoffActiveURLObserver(this)); observer_.reset(new HandoffActiveURLObserver(this));
} }
HandoffActiveURLObserverBridge::~HandoffActiveURLObserverBridge(){}; HandoffActiveURLObserverBridge::~HandoffActiveURLObserverBridge() {}
void HandoffActiveURLObserverBridge::HandoffActiveURLChanged( void HandoffActiveURLObserverBridge::HandoffActiveURLChanged(
content::WebContents* web_contents) { content::WebContents* web_contents) {

@@ -21,7 +21,7 @@ class HandoffActiveURLObserverDelegate {
virtual void HandoffActiveURLChanged(content::WebContents* web_contents) = 0; virtual void HandoffActiveURLChanged(content::WebContents* web_contents) = 0;
protected: protected:
virtual ~HandoffActiveURLObserverDelegate(){}; virtual ~HandoffActiveURLObserverDelegate() {}
}; };
#endif // CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_DELEGATE_H_ #endif // CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_DELEGATE_H_

@@ -286,7 +286,7 @@ TEST_F(ImageCaptureDeviceManagerTest, TestAttachDetach) {
DetachDevice(&manager, device); DetachDevice(&manager, device);
devices = monitor_->GetAllAvailableStorages(); devices = monitor_->GetAllAvailableStorages();
ASSERT_EQ(0U, devices.size()); ASSERT_EQ(0U, devices.size());
}; }
TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) { TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) {
ImageCaptureDeviceManager manager; ImageCaptureDeviceManager manager;

@@ -43,7 +43,7 @@ gfx::NativeEvent NativeInputEventBuilder::CreateEvent(
charactersIgnoringModifiers:character charactersIgnoringModifiers:character
isARepeat:NO isARepeat:NO
keyCode:event.native_key_code] retain]; keyCode:event.native_key_code] retain];
}; }
} // namespace protocol } // namespace protocol
} // namespace content } // namespace content

@@ -98,10 +98,10 @@ class CONTENT_EXPORT RenderViewHostDelegateView {
int selected_item, int selected_item,
const std::vector<MenuItem>& items, const std::vector<MenuItem>& items,
bool right_aligned, bool right_aligned,
bool allow_multiple_selection) {}; bool allow_multiple_selection) {}
// Hides a popup menu opened by ShowPopupMenu(). // Hides a popup menu opened by ShowPopupMenu().
virtual void HidePopupMenu() {}; virtual void HidePopupMenu() {}
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)

@@ -39,6 +39,6 @@ class WebSandboxSupportMac : public blink::WebSandboxSupport {
DISALLOW_COPY_AND_ASSIGN(WebSandboxSupportMac); DISALLOW_COPY_AND_ASSIGN(WebSandboxSupportMac);
}; };
}; // namespace content } // namespace content
#endif // CONTENT_CHILD_CHILD_PROCESS_SANDBOX_SUPPORT_IMPL_MAC_H_ #endif // CONTENT_CHILD_CHILD_PROCESS_SANDBOX_SUPPORT_IMPL_MAC_H_

@@ -105,7 +105,7 @@ extern "C" {
void _LSSetApplicationLaunchServicesServerConnectionStatus( void _LSSetApplicationLaunchServicesServerConnectionStatus(
uint64_t flags, uint64_t flags,
bool (^connection_allowed)(CFDictionaryRef)); bool (^connection_allowed)(CFDictionaryRef));
}; }
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
namespace content { namespace content {

@@ -25,7 +25,7 @@
extern "C" { extern "C" {
CGError CGSSetDenyWindowServerConnections(bool); CGError CGSSetDenyWindowServerConnections(bool);
}; }
namespace content { namespace content {

@@ -25,11 +25,11 @@ class BluetoothLowEnergyPeripheralBridge {
void DidDiscoverPrimaryServices(NSError* error) { void DidDiscoverPrimaryServices(NSError* error) {
device_mac_->DidDiscoverPrimaryServices(error); device_mac_->DidDiscoverPrimaryServices(error);
}; }
void DidDiscoverCharacteristics(CBService* service, NSError* error) { void DidDiscoverCharacteristics(CBService* service, NSError* error) {
device_mac_->DidDiscoverCharacteristics(service, error); device_mac_->DidDiscoverCharacteristics(service, error);
}; }
void DidUpdateValue(CBCharacteristic* characteristic, NSError* error) { void DidUpdateValue(CBCharacteristic* characteristic, NSError* error) {
device_mac_->DidUpdateValue(characteristic, error); device_mac_->DidUpdateValue(characteristic, error);

@@ -38,7 +38,7 @@ class BluetoothTestMac::ScopedMockCentralManager {
} }
// Returns MockCentralManager instance. // Returns MockCentralManager instance.
MockCentralManager* get() { return mock_central_manager_; }; MockCentralManager* get() { return mock_central_manager_; }
private: private:
scoped_nsobject<MockCentralManager> mock_central_manager_; scoped_nsobject<MockCentralManager> mock_central_manager_;

@@ -80,8 +80,8 @@ API_AVAILABLE(macos(10.12.2)) {
ASSERT_TRUE(opt_response); ASSERT_TRUE(opt_response);
ASSERT_TRUE(opt_response->credential()); ASSERT_TRUE(opt_response->credential());
EXPECT_FALSE(opt_response->credential()->id().empty()); EXPECT_FALSE(opt_response->credential()->id().empty());
};
} }
} // namespace
} // namespace mac } // namespace mac
} // namespace fido } // namespace fido
} // namespace device } // namespace device

@@ -59,7 +59,7 @@ API_AVAILABLE(macosx(10.12.2)) {
EXPECT_EQ(CtapDeviceResponseCode::kSuccess, error); EXPECT_EQ(CtapDeviceResponseCode::kSuccess, error);
auto opt_response = std::move(std::get<1>(result)); auto opt_response = std::move(std::get<1>(result));
ASSERT_TRUE(opt_response); ASSERT_TRUE(opt_response);
}; }
} // namespace } // namespace
} // namespace mac } // namespace mac

@@ -8,7 +8,7 @@
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
extern "C" { extern "C" {
#include <sandbox.h> #include <sandbox.h>
}; }
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <stddef.h> #include <stddef.h>

@@ -45,4 +45,4 @@ TEST(VideoCaptureDeviceFactoryMacTest, ListDevicesAVFoundation) {
})); }));
} }
}; // namespace media } // namespace media

@@ -19,6 +19,6 @@ class Crc8 {
unsigned char checksum, unsigned char checksum,
bool * matches); bool * matches);
}; };
}; // namespace rlz_lib } // namespace rlz_lib
#endif // RLZ_LIB_CRC8_H_ #endif // RLZ_LIB_CRC8_H_

@@ -22,6 +22,6 @@ const size_t kMaxPingResponseLength = 0x4000; // 16K
// Access: No restrictions. // Access: No restrictions.
bool RLZ_LIB_API IsPingResponseValid(const char* response, int* checksum_idx); bool RLZ_LIB_API IsPingResponseValid(const char* response, int* checksum_idx);
}; // namespace rlz_lib } // namespace rlz_lib
#endif // RLZ_LIB_NET_RESPONSE_CHECK_H_ #endif // RLZ_LIB_NET_RESPONSE_CHECK_H_

@@ -21,6 +21,6 @@ bool GetHexValue(char letter, int* value);
int HexStringToInteger(const char* text); int HexStringToInteger(const char* text);
}; // namespace } // namespace rlz_lib
#endif // RLZ_LIB_STRING_UTILS_H_ #endif // RLZ_LIB_STRING_UTILS_H_

@@ -19,7 +19,7 @@ int sandbox_init_with_parameters(const char* profile,
// 1 if sandboxed. Note `type` is actually a sandbox_filter_type enum value, but // 1 if sandboxed. Note `type` is actually a sandbox_filter_type enum value, but
// it is unused currently. // it is unused currently.
int sandbox_check(pid_t pid, const char* operation, int type, ...); int sandbox_check(pid_t pid, const char* operation, int type, ...);
}; }
namespace sandbox { namespace sandbox {

@@ -134,7 +134,7 @@ MULTIPROCESS_TEST_MAIN(FileReadAccess) {
PCHECK(fd.get() > 0); PCHECK(fd.get() > 0);
return 0; return 0;
}; }
} // namespace } // namespace
} // namespace sandbox } // namespace sandbox

@@ -110,7 +110,7 @@ bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
// one interface did not fail. // one interface did not fail.
return interface_error_count == 0 || return interface_error_count == 0 ||
[supported_interfaces count] > interface_error_count; [supported_interfaces count] > interface_error_count;
}; }
// The time periods, in milliseconds, between successive polls of the wifi data. // The time periods, in milliseconds, between successive polls of the wifi data.
const int kDefaultPollingInterval = 120000; // 2 mins const int kDefaultPollingInterval = 120000; // 2 mins

@@ -170,7 +170,7 @@ FontPlatformData::~FontPlatformData() = default;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
CTFontRef FontPlatformData::CtFont() const { CTFontRef FontPlatformData::CtFont() const {
return SkTypeface_GetCTFontRef(typeface_.get()); return SkTypeface_GetCTFontRef(typeface_.get());
}; }
CGFontRef FontPlatformData::CgFont() const { CGFontRef FontPlatformData::CgFont() const {
if (!CtFont()) if (!CtFont())

@@ -19,7 +19,7 @@
extern "C" { extern "C" {
typedef uint32_t CGSConnectionID; typedef uint32_t CGSConnectionID;
CGSConnectionID CGSMainConnectionID(void); CGSConnectionID CGSMainConnectionID(void);
}; }
// The CAContextID type identifies a CAContext across processes. This is the // The CAContextID type identifies a CAContext across processes. This is the
// token that is passed from the process that is sharing the CALayer that it is // token that is passed from the process that is sharing the CALayer that it is

@@ -1774,8 +1774,8 @@ class CustomTitleWidgetDelegate : public WidgetDelegate {
// WidgetDelegate: // WidgetDelegate:
base::string16 GetWindowTitle() const override { return title_; } base::string16 GetWindowTitle() const override { return title_; }
bool ShouldShowWindowTitle() const override { return should_show_title_; } bool ShouldShowWindowTitle() const override { return should_show_title_; }
Widget* GetWidget() override { return widget_; }; Widget* GetWidget() override { return widget_; }
const Widget* GetWidget() const override { return widget_; }; const Widget* GetWidget() const override { return widget_; }
private: private:
Widget* widget_; Widget* widget_;