[Sync] Fixing lint violations in src/sync/internal_api/*

BUG=567301

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

Cr-Commit-Position: refs/heads/master@{#364594}

8 files changed, 18 insertions, 18 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 16fa149..f105723 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_UTIL_EXPERIMENTS_
-#define SYNC_UTIL_EXPERIMENTS_
+#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_EXPERIMENTS_H_
+#define SYNC_INTERNAL_API_PUBLIC_UTIL_EXPERIMENTS_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ struct Experiments {
 
 }  // namespace syncer
 
-#endif  // SYNC_UTIL_EXPERIMENTS_
+#endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_EXPERIMENTS_H_
diff --git a/sync/internal_api/public/util/immutable.h b/sync/internal_api/public/util/immutable.h
index 683a5e6..23ac696 100644
--- a/sync/internal_api/public/util/immutable.h
+++ b/sync/internal_api/public/util/immutable.h
@@ -61,8 +61,8 @@
 // with forward-declared types.  See comments on traits below for
 // details.
 
-#ifndef SYNC_UTIL_IMMUTABLE_H_
-#define SYNC_UTIL_IMMUTABLE_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_
+#define SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_
 
 // For std::swap().
 #include <algorithm>
@@ -257,4 +257,4 @@ Immutable<T> MakeImmutable(T* t) {
 
 }  // namespace syncer
 
-#endif  // SYNC_UTIL_IMMUTABLE_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_IMMUTABLE_H_
diff --git a/sync/internal_api/public/util/immutable_unittest.cc b/sync/internal_api/public/util/immutable_unittest.cc
index 247325f..954a08f 100644
--- a/sync/internal_api/public/util/immutable_unittest.cc
+++ b/sync/internal_api/public/util/immutable_unittest.cc
@@ -113,7 +113,7 @@ void swap(syncer::SpecializationToken& t1,
   t1.Swap(&t2);
 }
 
-}  // namespace
+}  // namespace std
 
 namespace syncer {
 namespace {
diff --git a/sync/internal_api/public/util/sync_db_util.h b/sync/internal_api/public/util/sync_db_util.h
index 3784a10..1deaae6 100644
--- a/sync/internal_api/public/util/sync_db_util.h
+++ b/sync/internal_api/public/util/sync_db_util.h
@@ -25,6 +25,6 @@ SYNC_EXPORT void CheckSyncDbLastModifiedTime(
     scoped_refptr<base::SingleThreadTaskRunner> callback_runner,
     base::Callback<void(base::Time)> callback);
 
-}  // namesapce syncer
+}  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_SYNC_DB_UTIL_H_
diff --git a/sync/internal_api/public/util/sync_string_conversions.h b/sync/internal_api/public/util/sync_string_conversions.h
index 9d45572..3084c52 100644
--- a/sync/internal_api/public/util/sync_string_conversions.h
+++ b/sync/internal_api/public/util/sync_string_conversions.h
@@ -20,6 +20,6 @@ SYNC_EXPORT const char* PassphraseRequiredReasonToString(
 SYNC_EXPORT const char* PassphraseTypeToString(PassphraseType type);
 
 const char* BootstrapTokenTypeToString(BootstrapTokenType type);
-}
+}  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_SYNC_STRING_CONVERSIONS_H_
diff --git a/sync/internal_api/public/util/unrecoverable_error_handler.h b/sync/internal_api/public/util/unrecoverable_error_handler.h
index 2bd2475..f63b916 100644
--- a/sync/internal_api/public/util/unrecoverable_error_handler.h
+++ b/sync/internal_api/public/util/unrecoverable_error_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
-#define SYNC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
+#define SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ class UnrecoverableErrorHandler {
 
 }  // namespace syncer
 
-#endif  // SYNC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_HANDLER_H_
diff --git a/sync/internal_api/public/util/unrecoverable_error_info.h b/sync/internal_api/public/util/unrecoverable_error_info.h
index 1fb9832..4eb12c9 100644
--- a/sync/internal_api/public/util/unrecoverable_error_info.h
+++ b/sync/internal_api/public/util/unrecoverable_error_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
-#define SYNC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
+#define SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
 // TODO(lipalani): Figure out the right location for this class so it is
 // accessible outside of sync engine as well.
 
@@ -37,4 +37,4 @@ class UnrecoverableErrorInfo {
 
 }  // namespace syncer
 
-#endif  // SYNC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_UNRECOVERABLE_ERROR_INFO_H_
diff --git a/sync/internal_api/public/util/weak_handle.h b/sync/internal_api/public/util/weak_handle.h
index 7a11a15..d5160f2 100644
--- a/sync/internal_api/public/util/weak_handle.h
+++ b/sync/internal_api/public/util/weak_handle.h
@@ -44,8 +44,8 @@
 //   void OnIOError(IOError err) { DCHECK(CalledOnValidThread(); ... }
 // };
 
-#ifndef SYNC_UTIL_WEAK_HANDLE_H_
-#define SYNC_UTIL_WEAK_HANDLE_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_UTIL_WEAK_HANDLE_H_
+#define SYNC_INTERNAL_API_PUBLIC_UTIL_WEAK_HANDLE_H_
 
 #include <cstddef>
 
@@ -373,4 +373,4 @@ WeakHandle<T> MakeWeakHandle(const base::WeakPtr<T>& ptr) {
 
 }  // namespace syncer
 
-#endif  // SYNC_UTIL_WEAK_HANDLE_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_UTIL_WEAK_HANDLE_H_