Reformat the WebRTC code base
Running clang-format with chromium's style guide.
The goal is n-fold:
* providing consistency and readability (that's what code guidelines are for)
* preventing noise with presubmit checks and git cl format
* building on the previous point: making it easier to automatically fix format issues
* you name it
Please consider using git-hyper-blame to ignore this commit.
Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}diff --git a/rtc_base/physicalsocketserver_unittest.cc b/rtc_base/physicalsocketserver_unittest.cc
index 26200bc..1e046c0 100644
--- a/rtc_base/physicalsocketserver_unittest.cc
+++ b/rtc_base/physicalsocketserver_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <memory>
#include <signal.h>
#include <stdarg.h>
+#include <memory>
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
@@ -39,25 +39,25 @@
class FakeSocketDispatcher : public SocketDispatcher {
public:
explicit FakeSocketDispatcher(PhysicalSocketServer* ss)
- : SocketDispatcher(ss) {
- }
+ : SocketDispatcher(ss) {}
FakeSocketDispatcher(SOCKET s, PhysicalSocketServer* ss)
- : SocketDispatcher(s, ss) {
- }
+ : SocketDispatcher(s, ss) {}
protected:
SOCKET DoAccept(SOCKET socket, sockaddr* addr, socklen_t* addrlen) override;
int DoSend(SOCKET socket, const char* buf, int len, int flags) override;
- int DoSendTo(SOCKET socket, const char* buf, int len, int flags,
- const struct sockaddr* dest_addr, socklen_t addrlen) override;
+ int DoSendTo(SOCKET socket,
+ const char* buf,
+ int len,
+ int flags,
+ const struct sockaddr* dest_addr,
+ socklen_t addrlen) override;
};
class FakePhysicalSocketServer : public PhysicalSocketServer {
public:
- explicit FakePhysicalSocketServer(PhysicalSocketTest* test)
- : test_(test) {
- }
+ explicit FakePhysicalSocketServer(PhysicalSocketTest* test) : test_(test) {}
AsyncSocket* CreateAsyncSocket(int family, int type) override {
SocketDispatcher* dispatcher = new FakeSocketDispatcher(this);
@@ -111,10 +111,10 @@
protected:
PhysicalSocketTest()
- : server_(new FakePhysicalSocketServer(this)),
- thread_(server_.get()),
- fail_accept_(false),
- max_send_size_(-1) {}
+ : server_(new FakePhysicalSocketServer(this)),
+ thread_(server_.get()),
+ fail_accept_(false),
+ max_send_size_(-1) {}
void ConnectInternalAcceptError(const IPAddress& loopback);
void WritableAfterPartialWrite(const IPAddress& loopback);
@@ -137,8 +137,10 @@
return SocketDispatcher::DoAccept(socket, addr, addrlen);
}
-int FakeSocketDispatcher::DoSend(SOCKET socket, const char* buf, int len,
- int flags) {
+int FakeSocketDispatcher::DoSend(SOCKET socket,
+ const char* buf,
+ int len,
+ int flags) {
FakePhysicalSocketServer* ss =
static_cast<FakePhysicalSocketServer*>(socketserver());
if (ss->GetTest()->MaxSendSize() >= 0) {
@@ -148,8 +150,12 @@
return SocketDispatcher::DoSend(socket, buf, len, flags);
}
-int FakeSocketDispatcher::DoSendTo(SOCKET socket, const char* buf, int len,
- int flags, const struct sockaddr* dest_addr, socklen_t addrlen) {
+int FakeSocketDispatcher::DoSendTo(SOCKET socket,
+ const char* buf,
+ int len,
+ int flags,
+ const struct sockaddr* dest_addr,
+ socklen_t addrlen) {
FakePhysicalSocketServer* ss =
static_cast<FakePhysicalSocketServer*>(socketserver());
if (ss->GetTest()->MaxSendSize() >= 0) {
@@ -157,7 +163,7 @@
}
return SocketDispatcher::DoSendTo(socket, buf, len, flags, dest_addr,
- addrlen);
+ addrlen);
}
TEST_F(PhysicalSocketTest, TestConnectIPv4) {
@@ -280,9 +286,11 @@
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6167
#if defined(WEBRTC_WIN)
-#define MAYBE_TestWritableAfterPartialWriteIPv4 DISABLED_TestWritableAfterPartialWriteIPv4
+#define MAYBE_TestWritableAfterPartialWriteIPv4 \
+ DISABLED_TestWritableAfterPartialWriteIPv4
#else
-#define MAYBE_TestWritableAfterPartialWriteIPv4 TestWritableAfterPartialWriteIPv4
+#define MAYBE_TestWritableAfterPartialWriteIPv4 \
+ TestWritableAfterPartialWriteIPv4
#endif
TEST_F(PhysicalSocketTest, MAYBE_TestWritableAfterPartialWriteIPv4) {
MAYBE_SKIP_IPV4;
@@ -291,9 +299,11 @@
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6167
#if defined(WEBRTC_WIN)
-#define MAYBE_TestWritableAfterPartialWriteIPv6 DISABLED_TestWritableAfterPartialWriteIPv6
+#define MAYBE_TestWritableAfterPartialWriteIPv6 \
+ DISABLED_TestWritableAfterPartialWriteIPv6
#else
-#define MAYBE_TestWritableAfterPartialWriteIPv6 TestWritableAfterPartialWriteIPv6
+#define MAYBE_TestWritableAfterPartialWriteIPv6 \
+ TestWritableAfterPartialWriteIPv6
#endif
TEST_F(PhysicalSocketTest, MAYBE_TestWritableAfterPartialWriteIPv6) {
MAYBE_SKIP_IPV6;
@@ -313,7 +323,6 @@
SocketTest::TestConnectWithDnsLookupFailIPv6();
}
-
TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv4) {
MAYBE_SKIP_IPV4;
SocketTest::TestConnectWithClosedSocketIPv4();
@@ -463,8 +472,7 @@
}
// Network binder shouldn't be used if the socket is bound to the "any" IP.
-TEST_F(PhysicalSocketTest,
- NetworkBinderIsNotUsedForAnyIp) {
+TEST_F(PhysicalSocketTest, NetworkBinderIsNotUsedForAnyIp) {
MAYBE_SKIP_IPV4;
FakeNetworkBinder fake_network_binder;
server_->set_network_binder(&fake_network_binder);
@@ -529,7 +537,7 @@
}
static std::vector<int> signals_received_;
- static Thread *signaled_thread_;
+ static Thread* signaled_thread_;
std::unique_ptr<PhysicalSocketServer> ss_;
};