Commit 26e74453 authored by isherman's avatar isherman Committed by Commit bot

[Clean-up] Run git cl format over the proximity_auth component.

BUG=none
TEST=none
R=tengs@chromium.org

Review URL: https://codereview.chromium.org/604213002

Cr-Commit-Position: refs/heads/master@{#296988}
parent a7638541
......@@ -24,11 +24,10 @@ typedef base::Callback<void(const std::string& error_message)> ErrorCallback;
// |error_callback| with an error message on failure. Because this can be an
// expensive operation, the work will be run on the provided |task_runner|,
// which should correspond to a background thread.
void SeekDeviceByAddress(
const std::string& device_address,
const base::Closure& callback,
const ErrorCallback& error_callback,
base::TaskRunner* task_runner);
void SeekDeviceByAddress(const std::string& device_address,
const base::Closure& callback,
const ErrorCallback& error_callback,
base::TaskRunner* task_runner);
void ConnectToServiceInsecurely(
device::BluetoothDevice* device,
......
......@@ -69,8 +69,7 @@ struct SeekDeviceResult {
// Writes |address| into the |result|. Return true on success, false if the
// |address| is not a valid Bluetooth address.
bool BluetoothAddressToBdaddr(const std::string& address,
bdaddr_t* result) {
bool BluetoothAddressToBdaddr(const std::string& address, bdaddr_t* result) {
std::string canonical_address = BluetoothDevice::CanonicalizeAddress(address);
if (canonical_address.empty())
return false;
......@@ -118,7 +117,7 @@ SeekDeviceResult SeekDeviceByAddressImpl(
net::SocketDescriptor socket_descriptor =
socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
int result = connect(socket_descriptor,
reinterpret_cast<struct sockaddr *>(&addr),
reinterpret_cast<struct sockaddr*>(&addr),
sizeof(addr));
if (result == 0) {
seek_result.success = true;
......@@ -151,7 +150,8 @@ void SeekDeviceByAddress(const std::string& device_address,
base::PostTaskAndReplyWithResult(
task_runner,
FROM_HERE,
base::Bind(&SeekDeviceByAddressImpl, device_address,
base::Bind(&SeekDeviceByAddressImpl,
device_address,
make_scoped_refptr(task_runner)),
base::Bind(&OnSeekDeviceResult, callback, error_callback));
}
......
......@@ -196,8 +196,8 @@ TEST(ProximityAuthConnectionTest,
connection.AddObserver(&observer);
ON_CALL(connection, DeserializeWireMessageProxy(_))
.WillByDefault(DoAll(SetArgPointee<0>(false),
Return(new TestWireMessage)));
.WillByDefault(
DoAll(SetArgPointee<0>(false), Return(new TestWireMessage)));
EXPECT_CALL(observer, OnMessageReceived(Ref(connection), _));
connection.OnBytesReceived(std::string());
}
......
......@@ -9,8 +9,8 @@
namespace proximity_auth {
TEST(ProximityAuthSystemTest, GetRemoteDevices) {
RemoteDevice device1 = { "device 1" };
RemoteDevice device2 = { "device 2" };
RemoteDevice device1 = {"device 1"};
RemoteDevice device2 = {"device 2"};
std::vector<RemoteDevice> device_list;
device_list.push_back(device1);
......
......@@ -8,8 +8,8 @@
int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);
return base::LaunchUnitTests(argc,
argv,
base::Bind(&base::TestSuite::Run,
base::Unretained(&test_suite)));
return base::LaunchUnitTests(
argc,
argv,
base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
......@@ -118,8 +118,7 @@ std::string WireMessage::Serialize() const {
WireMessage::WireMessage(const std::string& permit_id,
const std::string& payload)
: permit_id_(permit_id),
payload_(payload) {
: permit_id_(permit_id), payload_(payload) {
}
} // namespace proximity_auth
......@@ -103,8 +103,7 @@ TEST(ProximityAuthWireMessage, Deserialize_BodyLacksPayload) {
TEST(ProximityAuthWireMessage, Deserialize_BodyHasEmptyPermitId) {
bool is_incomplete;
std::string header("\3\0\x24", 3);
std::string bytes =
header + "{\"permit_id\": \"\", \"payload\": \"YQ==\"}";
std::string bytes = header + "{\"permit_id\": \"\", \"payload\": \"YQ==\"}";
scoped_ptr<WireMessage> message =
WireMessage::Deserialize(bytes, &is_incomplete);
EXPECT_FALSE(is_incomplete);
......@@ -116,8 +115,7 @@ TEST(ProximityAuthWireMessage, Deserialize_BodyHasEmptyPermitId) {
TEST(ProximityAuthWireMessage, Deserialize_BodyHasEmptyPayload) {
bool is_incomplete;
std::string header("\3\0\x23", 3);
std::string bytes =
header + "{\"permit_id\": \"Hi!\", \"payload\": \"\"}";
std::string bytes = header + "{\"permit_id\": \"Hi!\", \"payload\": \"\"}";
scoped_ptr<WireMessage> message =
WireMessage::Deserialize(bytes, &is_incomplete);
EXPECT_FALSE(is_incomplete);
......@@ -151,13 +149,12 @@ TEST(ProximityAuthWireMessage, Deserialize_ValidMessage) {
TEST(ProximityAuthWireMessage, Deserialize_ValidMessageWithExtraUnknownFields) {
bool is_incomplete;
std::string header("\3\0\x46", 3);
std::string bytes =
header +
"{"
" \"permit_id\": \"Hi!\","
" \"payload\": \"YQ==\","
" \"unexpected\": \"surprise!\""
"}";
std::string bytes = header +
"{"
" \"permit_id\": \"Hi!\","
" \"payload\": \"YQ==\","
" \"unexpected\": \"surprise!\""
"}";
scoped_ptr<WireMessage> message =
WireMessage::Deserialize(bytes, &is_incomplete);
EXPECT_FALSE(is_incomplete);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment