Remove a few unnecessary semicolons.
This CL was uploaded by git cl split.
R=garykac@chromium.org
Bug: 926235
Change-Id: I3cb9afe2ffb856804dce95582f2a4d59e84f8393
Reviewed-on: https://chromium-review.googlesource.com/c/1463279
Reviewed-by: Joe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630757}diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc
index f57188f..b252ea9 100644
--- a/remoting/base/buffered_socket_writer_unittest.cc
+++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -120,7 +120,7 @@
writer_->Start(base::Bind(&WriteNetSocket, socket_.get()),
base::Bind(&BufferedSocketWriterTest::OnWriteFailed,
base::Unretained(this)));
- };
+ }
void OnWriteFailed(int error) {
write_error_ = error;
diff --git a/remoting/base/chromoting_event_log_writer.h b/remoting/base/chromoting_event_log_writer.h
index edb2ee54..6fe0f89 100644
--- a/remoting/base/chromoting_event_log_writer.h
+++ b/remoting/base/chromoting_event_log_writer.h
@@ -11,7 +11,7 @@
class ChromotingEventLogWriter {
public:
- virtual ~ChromotingEventLogWriter(){};
+ virtual ~ChromotingEventLogWriter() {}
virtual void Log(const ChromotingEvent& entry) = 0;
};
diff --git a/remoting/host/backoff_timer.cc b/remoting/host/backoff_timer.cc
index 4965d7d..a7dd3d3 100644
--- a/remoting/host/backoff_timer.cc
+++ b/remoting/host/backoff_timer.cc
@@ -32,7 +32,7 @@
timer_->Stop();
user_task_.Reset();
backoff_entry_.reset();
-};
+}
void BackoffTimer::SetTimerForTest(std::unique_ptr<base::OneShotTimer> timer) {
timer_ = std::move(timer);
diff --git a/remoting/host/desktop_display_info.h b/remoting/host/desktop_display_info.h
index 8f00da5..d5cf5f9 100644
--- a/remoting/host/desktop_display_info.h
+++ b/remoting/host/desktop_display_info.h
@@ -46,7 +46,7 @@
bool operator==(const DesktopDisplayInfo& other);
bool operator!=(const DesktopDisplayInfo& other);
- const std::vector<DisplayGeometry>& displays() const { return displays_; };
+ const std::vector<DisplayGeometry>& displays() const { return displays_; }
private:
std::vector<DisplayGeometry> displays_;
diff --git a/remoting/host/file_transfer/fake_file_operations.cc b/remoting/host/file_transfer/fake_file_operations.cc
index 26b442b2..58d688d 100644
--- a/remoting/host/file_transfer/fake_file_operations.cc
+++ b/remoting/host/file_transfer/fake_file_operations.cc
@@ -77,7 +77,7 @@
FakeFileOperations::FakeFileWriter::~FakeFileWriter() {
Cancel();
-};
+}
void FakeFileOperations::FakeFileWriter::WriteChunk(std::string data,
Callback callback) {
diff --git a/remoting/host/host_status_monitor.h b/remoting/host/host_status_monitor.h
index a388ee6..f73a039b 100644
--- a/remoting/host/host_status_monitor.h
+++ b/remoting/host/host_status_monitor.h
@@ -23,7 +23,7 @@
const base::ObserverList<HostStatusObserver>::Unchecked& observers() {
return observers_;
- };
+ }
protected:
friend class base::RefCountedThreadSafe<HostStatusMonitor>;
diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc
index 9fa650b..bc54071 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host.cc
@@ -345,7 +345,7 @@
incoming_message_callback_.Run(iq);
SendMessageToClient(std::move(response));
-};
+}
void It2MeNativeMessagingHost::SendOutgoingIq(const std::string& iq) {
std::unique_ptr<base::DictionaryValue> message(new base::DictionaryValue());
diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc
index e4dd7a4..52a3135 100644
--- a/remoting/host/policy_watcher_unittest.cc
+++ b/remoting/host/policy_watcher_unittest.cc
@@ -46,7 +46,6 @@
class MockPolicyCallback {
public:
MockPolicyCallback() = default;
- ;
// TODO(lukasza): gmock cannot mock a method taking std::unique_ptr<T>...
MOCK_METHOD1(OnPolicyUpdatePtr, void(const base::DictionaryValue* policies));
diff --git a/remoting/host/server_log_entry_host.cc b/remoting/host/server_log_entry_host.cc
index 62d1e79..1cf10b7e 100644
--- a/remoting/host/server_log_entry_host.cc
+++ b/remoting/host/server_log_entry_host.cc
@@ -56,7 +56,7 @@
entry->Set(kKeyOsVersion, GetHostOperatingSystemVersion());
entry->Set(kKeyHostVersion, STRINGIZE(VERSION));
entry->AddCpuField();
-};
+}
void AddConnectionTypeToLogEntry(ServerLogEntry* entry,
protocol::TransportRoute::RouteType type) {
diff --git a/remoting/protocol/fake_connection_to_client.cc b/remoting/protocol/fake_connection_to_client.cc
index 69edc4fd..8e4721a 100644
--- a/remoting/protocol/fake_connection_to_client.cc
+++ b/remoting/protocol/fake_connection_to_client.cc
@@ -32,7 +32,7 @@
observer_ = observer;
}
-void FakeVideoStream::SelectSource(int id) {};
+void FakeVideoStream::SelectSource(int id) {}
base::WeakPtr<FakeVideoStream> FakeVideoStream::GetWeakPtr() {
return weak_factory_.GetWeakPtr();
diff --git a/remoting/protocol/ice_transport_channel.h b/remoting/protocol/ice_transport_channel.h
index 8aeb9d3..ab6a4f1f 100644
--- a/remoting/protocol/ice_transport_channel.h
+++ b/remoting/protocol/ice_transport_channel.h
@@ -38,8 +38,8 @@
public:
class Delegate {
public:
- Delegate() {};
- virtual ~Delegate() {};
+ Delegate() {}
+ virtual ~Delegate() {}
// Called to pass ICE credentials to the session. Used only for STANDARD
// version of ICE, see SetIceVersion().
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 6e8c769..2928677 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -168,7 +168,7 @@
<< next_incoming_ << " current= " << current;
}
return result;
-};
+}
void JingleSession::OrderedMessageQueue::SetInitialId(const std::string& id) {
int current = GetSequentialId(id);
diff --git a/remoting/protocol/p2p_datagram_socket.h b/remoting/protocol/p2p_datagram_socket.h
index 1366223..606ccbb 100644
--- a/remoting/protocol/p2p_datagram_socket.h
+++ b/remoting/protocol/p2p_datagram_socket.h
@@ -17,7 +17,7 @@
// Peer-to-peer socket with datagram semantics.
class P2PDatagramSocket {
public:
- virtual ~P2PDatagramSocket() {};
+ virtual ~P2PDatagramSocket() {}
// Receives a packet, up to |buf_len| bytes, from the socket. Size of the
// incoming packet is returned in case of success. If the packet is larger
diff --git a/remoting/protocol/p2p_stream_socket.h b/remoting/protocol/p2p_stream_socket.h
index 805f6718..2f4bbc3 100644
--- a/remoting/protocol/p2p_stream_socket.h
+++ b/remoting/protocol/p2p_stream_socket.h
@@ -18,7 +18,7 @@
// Peer-to-peer socket with stream semantics.
class P2PStreamSocket {
public:
- virtual ~P2PStreamSocket() {};
+ virtual ~P2PStreamSocket() {}
// Reads data, up to |buf_len| bytes, from the socket. The number of bytes
// read is returned, or an error is returned upon failure. ERR_IO_PENDING
diff --git a/remoting/protocol/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc
index db96be54c..c60d1238 100644
--- a/remoting/protocol/pseudotcp_adapter_unittest.cc
+++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -39,7 +39,7 @@
class RateLimiter {
public:
virtual ~RateLimiter() = default;
- ;
+
// Returns true if the new packet needs to be dropped, false otherwise.
virtual bool DropNextPacket() = 0;
};
@@ -107,9 +107,9 @@
void set_rate_limiter(RateLimiter* rate_limiter) {
rate_limiter_ = rate_limiter;
- };
+ }
- void set_latency(int latency_ms) { latency_ms_ = latency_ms; };
+ void set_latency(int latency_ms) { latency_ms_ = latency_ms; }
// P2PDatagramSocket interface.
int Recv(const scoped_refptr<net::IOBuffer>& buf, int buf_len,
diff --git a/remoting/protocol/rejecting_authenticator.cc b/remoting/protocol/rejecting_authenticator.cc
index 4f58f5b..05c3dc7 100644
--- a/remoting/protocol/rejecting_authenticator.cc
+++ b/remoting/protocol/rejecting_authenticator.cc
@@ -47,7 +47,7 @@
const std::string& RejectingAuthenticator::GetAuthKey() const {
NOTREACHED();
return auth_key_;
-};
+}
std::unique_ptr<ChannelAuthenticator>
RejectingAuthenticator::CreateChannelAuthenticator() const {
diff --git a/remoting/protocol/webrtc_frame_scheduler_unittest.cc b/remoting/protocol/webrtc_frame_scheduler_unittest.cc
index b3912a6..3af2de2 100644
--- a/remoting/protocol/webrtc_frame_scheduler_unittest.cc
+++ b/remoting/protocol/webrtc_frame_scheduler_unittest.cc
@@ -101,7 +101,7 @@
// Should not be sent, because of throttling of empty frames.
EXPECT_FALSE(result);
-};
+}
TEST_F(WebrtcFrameSchedulerTest, EmptyFrameUpdate_ShouldBeSentAfter2000ms) {
// Identical to the previous test, except it waits a short amount of time
@@ -123,7 +123,7 @@
// Empty frames should be sent at the throttled rate.
EXPECT_TRUE(result);
-};
+}
TEST_F(WebrtcFrameSchedulerTest, Capturer_RunsAt30Fps) {
simulate_capture_ = true;
diff --git a/remoting/signaling/xmpp_login_handler.cc b/remoting/signaling/xmpp_login_handler.cc
index 51bf49d..f331f27 100644
--- a/remoting/signaling/xmpp_login_handler.cc
+++ b/remoting/signaling/xmpp_login_handler.cc
@@ -215,7 +215,7 @@
"xmlns:auth=\"http://www.google.com/talk/protocol/auth\">" +
cookie +
"</auth>");
-};
+}
void XmppLoginHandler::OnParserError() {
OnError(SignalStrategy::PROTOCOL_ERROR);
diff --git a/remoting/signaling/xmpp_stream_parser_unittest.cc b/remoting/signaling/xmpp_stream_parser_unittest.cc
index 64b18bf..bce9fc59 100644
--- a/remoting/signaling/xmpp_stream_parser_unittest.cc
+++ b/remoting/signaling/xmpp_stream_parser_unittest.cc
@@ -51,18 +51,18 @@
TEST_F(XmppStreamParserTest, ParseXmppStream) {
parser_->AppendData("<stream><iq>text</iq>");
EXPECT_EQ(received_stanzas_[0]->Str(), "<iq>text</iq>");
-};
+}
TEST_F(XmppStreamParserTest, HandleMultipleIncomingStanzas) {
parser_->AppendData("<stream><iq>text</iq><iq>more text</iq>");
EXPECT_EQ(received_stanzas_[0]->Str(), "<iq>text</iq>");
EXPECT_EQ(received_stanzas_[1]->Str(), "<iq>more text</iq>");
-};
+}
TEST_F(XmppStreamParserTest, IgnoreWhitespaceBetweenStanzas) {
parser_->AppendData("<stream> <iq>text</iq>");
EXPECT_EQ(received_stanzas_[0]->Str(), "<iq>text</iq>");
-};
+}
TEST_F(XmppStreamParserTest, AssembleMessagesFromChunks) {
parser_->AppendData("<stream><i");
@@ -76,22 +76,22 @@
parser_->AppendData("</iq>");
EXPECT_EQ(received_stanzas_[0]->Str(), "<iq>😃</iq>");
-};
+}
TEST_F(XmppStreamParserTest, StopParsingOnErrors) {
parser_->AppendData("<stream><invalidtag p!='a'></invalidtag><iq>text</iq>");
EXPECT_TRUE(error_);
EXPECT_TRUE(received_stanzas_.empty());
-};
+}
TEST_F(XmppStreamParserTest, FailOnInvalidStreamHeader) {
parser_->AppendData("<stream p!='a'>");
EXPECT_TRUE(error_);
-};
+}
TEST_F(XmppStreamParserTest, FailOnLooseText) {
parser_->AppendData("stream<");
EXPECT_TRUE(error_);
-};
+}
} // namespace remoting
diff --git a/remoting/test/access_token_fetcher.h b/remoting/test/access_token_fetcher.h
index da0c9e7..62f18d2 100644
--- a/remoting/test/access_token_fetcher.h
+++ b/remoting/test/access_token_fetcher.h
@@ -16,7 +16,7 @@
namespace network {
class SharedURLLoaderFactory;
class TransitionalURLLoaderFactoryOwner;
-}; // namespace network
+} // namespace network
namespace remoting {
namespace test {
diff --git a/remoting/test/fake_connection_event_logger.cc b/remoting/test/fake_connection_event_logger.cc
index 7ee1b37..a88dbf9f 100644
--- a/remoting/test/fake_connection_event_logger.cc
+++ b/remoting/test/fake_connection_event_logger.cc
@@ -230,7 +230,7 @@
const protocol::PairingRequest& pairing_request) override {}
void SetCapabilities(const protocol::Capabilities& capabilities) override {}
void SelectDesktopDisplay(
- const protocol::SelectDesktopDisplayRequest& select_display) override{};
+ const protocol::SelectDesktopDisplayRequest& select_display) override {}
};
FakeConnectionEventLogger::CounterHostStub::CounterHostStub()
