attestation: fix linter issues

Fixed various issues reported by cpplint.py when run on
src/platform2/attestation.

BUG=None
TEST=cpplint.py `find attestation/* | grep "\.cc\|\.h"`
     USE=attestation FEATURES=test emerge-link platform2

Change-Id: Ie779616f4b8e0fda9c7646776540bc83c0c1a193
Reviewed-on: https://chromium-review.googlesource.com/210524
Tested-by: Alex Vakulenko <[email protected]>
Reviewed-by: Alex Deymo <[email protected]>
Commit-Queue: Alex Vakulenko <[email protected]>
diff --git a/common/dbus_interface.h b/common/dbus_interface.h
index f45ce32..9adf683 100644
--- a/common/dbus_interface.h
+++ b/common/dbus_interface.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 ATTESTATION_COMMON_DBUS_INTERFACE_H
-#define ATTESTATION_COMMON_DBUS_INTERFACE_H
+#ifndef ATTESTATION_COMMON_DBUS_INTERFACE_H_
+#define ATTESTATION_COMMON_DBUS_INTERFACE_H_
 
 namespace attestation {
 
@@ -15,6 +15,6 @@
 // Methods exported by attestation.
 constexpr char kStatsMethod[] = "GetStats";
 
-}; // namespace attestation
+}  // namespace attestation
 
-#endif // ATTESTATION_COMMON_DBUS_INTERFACE_H
+#endif  // ATTESTATION_COMMON_DBUS_INTERFACE_H_
diff --git a/server/attestation_service.cc b/server/attestation_service.cc
index 2891fe1..5b757ee 100644
--- a/server/attestation_service.cc
+++ b/server/attestation_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "attestation_service.h"
+#include "attestation/server/attestation_service.h"
 
 #include <string>
 
@@ -30,7 +30,7 @@
   response_sender.Run(response.Pass());
 }
 
-} // namespace
+}  // namespace
 
 AttestationService::AttestationService()
     : start_time_(base::Time()),
@@ -79,4 +79,4 @@
   return response.Pass();
 }
 
-} // namespace attestation
+}  // namespace attestation
diff --git a/server/attestation_service.h b/server/attestation_service.h
index a352f32..bf393db 100644
--- a/server/attestation_service.h
+++ b/server/attestation_service.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 ATTESTATION_SERVER_SERVICE_H
-#define ATTESTATION_SERVER_SERVICE_H
+#ifndef ATTESTATION_SERVER_ATTESTATION_SERVICE_H_
+#define ATTESTATION_SERVER_ATTESTATION_SERVICE_H_
 
 #include <string>
 
@@ -49,6 +49,6 @@
   DISALLOW_COPY_AND_ASSIGN(AttestationService);
 };
 
-} // namespace attestation
+}  // namespace attestation
 
-#endif // ATTESTATION_SERVER_SERVICE_H
+#endif  // ATTESTATION_SERVER_ATTESTATION_SERVICE_H_
diff --git a/server/main.cc b/server/main.cc
index ccea698..7291451 100644
--- a/server/main.cc
+++ b/server/main.cc
@@ -11,7 +11,7 @@
 #include <base/strings/stringprintf.h>
 #include <chromeos/syslog_logging.h>
 
-#include "attestation_service.h"
+#include "attestation/server/attestation_service.h"
 
 int main(int argc, char* argv[]) {
   CommandLine::Init(argc, argv);