summaryrefslogtreecommitdiffstats
path: root/sync/android
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/android
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/android')
-rw-r--r--sync/android/model_type_helper.cc2
-rw-r--r--sync/android/model_type_helper.h6
-rw-r--r--sync/android/sync_jni_registrar.h6
3 files changed, 8 insertions, 6 deletions
diff --git a/sync/android/model_type_helper.cc b/sync/android/model_type_helper.cc
index 64d808f..304d9e7 100644
--- a/sync/android/model_type_helper.cc
+++ b/sync/android/model_type_helper.cc
@@ -4,6 +4,8 @@
#include "sync/android/model_type_helper.h"
+#include <string>
+
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "jni/ModelTypeHelper_jni.h"
diff --git a/sync/android/model_type_helper.h b/sync/android/model_type_helper.h
index dc3d6bf..d389d08 100644
--- a/sync/android/model_type_helper.h
+++ b/sync/android/model_type_helper.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_MODEL_TYPE_HELPER_H_
-#define SYNC_MODEL_TYPE_HELPER_H_
+#ifndef SYNC_ANDROID_MODEL_TYPE_HELPER_H_
+#define SYNC_ANDROID_MODEL_TYPE_HELPER_H_
#include <jni.h>
@@ -13,4 +13,4 @@ bool RegisterModelTypeHelperJni(JNIEnv* env);
}
-#endif // SYNC_MODEL_TYPE_HELPER_H_
+#endif // SYNC_ANDROID_MODEL_TYPE_HELPER_H_
diff --git a/sync/android/sync_jni_registrar.h b/sync/android/sync_jni_registrar.h
index 5a13680..548407f 100644
--- a/sync/android/sync_jni_registrar.h
+++ b/sync/android/sync_jni_registrar.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_JNI_REGISTRAR_H_
-#define SYNC_JNI_REGISTRAR_H_
+#ifndef SYNC_ANDROID_SYNC_JNI_REGISTRAR_H_
+#define SYNC_ANDROID_SYNC_JNI_REGISTRAR_H_
#include <jni.h>
@@ -15,4 +15,4 @@ SYNC_EXPORT bool RegisterSyncJni(JNIEnv* env);
}
-#endif // SYNC_JNI_REGISTRAR_H_
+#endif // SYNC_ANDROID_SYNC_JNI_REGISTRAR_H_