summaryrefslogtreecommitdiffstats
path: root/sync/protocol
diff options
context:
space:
mode:
authorskym <skym@chromium.org>2015-12-14 11:56:34 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-14 19:57:20 +0000
commitf593336f972fa8d64584baf5c2e5cef809857a88 (patch)
treecc265bd5b06199bb10a78dd1835fb67db0312ebf /sync/protocol
parentd9f3318112e50d0cfd3e2c2cd97b236dd0038f79 (diff)
downloadchromium_src-f593336f972fa8d64584baf5c2e5cef809857a88.zip
chromium_src-f593336f972fa8d64584baf5c2e5cef809857a88.tar.gz
chromium_src-f593336f972fa8d64584baf5c2e5cef809857a88.tar.bz2
[Sync] Fixing all trivial lint violations in src/sync/*
BUG=567301 Review URL: https://codereview.chromium.org/1510023002 Cr-Commit-Position: refs/heads/master@{#365077}
Diffstat (limited to 'sync/protocol')
-rw-r--r--sync/protocol/proto_enum_conversions_unittest.cc1
-rw-r--r--sync/protocol/proto_value_conversions.cc1
-rw-r--r--sync/protocol/proto_value_conversions_unittest.cc2
-rw-r--r--sync/protocol/sync_protocol_error.h2
4 files changed, 4 insertions, 2 deletions
diff --git a/sync/protocol/proto_enum_conversions_unittest.cc b/sync/protocol/proto_enum_conversions_unittest.cc
index db88a8f..247d918 100644
--- a/sync/protocol/proto_enum_conversions_unittest.cc
+++ b/sync/protocol/proto_enum_conversions_unittest.cc
@@ -88,7 +88,6 @@ TEST_F(ProtoEnumConversionsTest, GetErrorTypeString) {
GetErrorTypeString,
sync_pb::SyncEnums::UNKNOWN,
sync_pb::SyncEnums::ErrorType_MAX);
-
}
TEST_F(ProtoEnumConversionsTest, GetActionString) {
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 154d2f7..ddafb9c 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -6,6 +6,7 @@
#include "sync/protocol/proto_value_conversions.h"
+#include <algorithm>
#include <string>
#include "base/base64.h"
diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc
index 9796c68..7c2bb95 100644
--- a/sync/protocol/proto_value_conversions_unittest.cc
+++ b/sync/protocol/proto_value_conversions_unittest.cc
@@ -6,6 +6,8 @@
#include "sync/protocol/proto_value_conversions.h"
+#include <string>
+
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
diff --git a/sync/protocol/sync_protocol_error.h b/sync/protocol/sync_protocol_error.h
index d65fd24..38c5f18 100644
--- a/sync/protocol/sync_protocol_error.h
+++ b/sync/protocol/sync_protocol_error.h
@@ -10,7 +10,7 @@
#include "sync/base/sync_export.h"
#include "sync/internal_api/public/base/model_type.h"
-namespace syncer{
+namespace syncer {
enum SyncProtocolErrorType {
// Success case.