commit b54b6dce29733370c74385e08ecd6666302f4df9
author Bertrand SIMONNET <bsimonnet@chromium.org> Wed Jul 02 12:13:56 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 08 17:31:14 2014 +0000
tree b9952e9b54cf69643a1275bab9ccc78b426ab1e8
parent e865fcabe29083c6ac5a3c797c7395fc1fbd66a0

libchromeos: Fix linting issues

This fixes the easiest linting issues introduced by the move from platform to
platform2 (mostly complete import path and correct header guard).

A second CL will address non trivial issues.

BUG=chromium:391075
TEST=FEATURES=test emerge-amd64-generic libchromeos bootstat platform2
TEST=emerge-daisy libchromeos bootstat platform2

Change-Id: Ide30a251b72c605a7a50f327bd89915bb3235498
Reviewed-on: https://chromium-review.googlesource.com/206519
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

chromeos/dbus/dbus.h

diff --git a/chromeos/dbus/dbus.h b/chromeos/dbus/dbus.h
index 45511cf..979608c 100644
--- a/chromeos/dbus/dbus.h
+++ b/chromeos/dbus/dbus.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 CHROMEOS_DBUS_H_
-#define CHROMEOS_DBUS_H_
+#ifndef LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_
+#define LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_
 
 #include <dbus/dbus-glib.h>
 #include <glib-object.h>
@@ -196,7 +196,7 @@
                               const char* service_path,
                               GObject* object);
 
-template <typename F> // F is a function signature
+template <typename F>  // F is a function signature
 class MonitorConnection;
 
 template <typename A1>
@@ -433,11 +433,10 @@
                            G_TYPE_STRING, property,
                            G_TYPE_INVALID,
                            G_TYPE_VALUE, &value,
-                           G_TYPE_INVALID)){
+                           G_TYPE_INVALID)) {
     LOG(ERROR) << "Getting property failed: "
                << (error->message ? error->message : "Unknown Error.");
     return false;
-
   }
   return glib::Retrieve(value, result);
 }
@@ -475,8 +474,8 @@
   SignalWatcher() {}
   ~SignalWatcher();
   void StartMonitoring(const std::string& interface, const std::string& signal);
- private:
 
+ private:
   // Callback invoked on the given signal arrival.
   virtual void OnSignal(DBusMessage* message) = 0;
 
@@ -494,4 +493,4 @@
 }  // namespace dbus
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_H_
+#endif  // LIBCHROMEOS_CHROMEOS_DBUS_DBUS_H_