summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtapuska <dtapuska@chromium.org>2015-02-09 14:51:40 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 22:52:15 +0000
commit1d622f0cb5ef828194a49c377e157710eab03b37 (patch)
tree4d62f171cf5f2f2f485d4d80f334376b86efc08f
parente635757699fe991b6aef2a0fc21e1f0b3ac691f6 (diff)
downloadchromium_src-1d622f0cb5ef828194a49c377e157710eab03b37.zip
chromium_src-1d622f0cb5ef828194a49c377e157710eab03b37.tar.gz
chromium_src-1d622f0cb5ef828194a49c377e157710eab03b37.tar.bz2
chromeos::dbus lint errors.
Fix lint issues. BUG=453873 Review URL: https://codereview.chromium.org/900793007 Cr-Commit-Position: refs/heads/master@{#315421}
-rw-r--r--chromeos/dbus/dbus_client_bundle.cc2
-rw-r--r--chromeos/dbus/dbus_client_bundle.h4
-rw-r--r--dbus/test_service.cc5
3 files changed, 9 insertions, 2 deletions
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index f80e2d29..313e52b 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -4,6 +4,8 @@
#include "chromeos/dbus/dbus_client_bundle.h"
+#include <vector>
+
#include "base/command_line.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h
index 4cb985e..8dbfd9d 100644
--- a/chromeos/dbus/dbus_client_bundle.h
+++ b/chromeos/dbus/dbus_client_bundle.h
@@ -5,6 +5,8 @@
#ifndef CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
#define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
+#include <string>
+
#include "base/memory/scoped_ptr.h"
#include "chromeos/chromeos_export.h"
@@ -119,8 +121,8 @@ class CHROMEOS_EXPORT DBusClientBundle {
BluetoothGattDescriptorClient* bluetooth_gatt_descriptor_client() {
return bluetooth_gatt_descriptor_client_.get();
-
}
+
BluetoothGattManagerClient* bluetooth_gatt_manager_client() {
return bluetooth_gatt_manager_client_.get();
}
diff --git a/dbus/test_service.cc b/dbus/test_service.cc
index 1ec2070..0170192 100644
--- a/dbus/test_service.cc
+++ b/dbus/test_service.cc
@@ -4,6 +4,9 @@
#include "dbus/test_service.h"
+#include <string>
+#include <vector>
+
#include "base/bind.h"
#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
@@ -485,7 +488,7 @@ void TestService::PerformAction(
RemoveObject(object_path);
} else if (action == "SetSendImmediatePropertiesChanged") {
SetSendImmediatePropertiesChanged();
- } if (action == "ReleaseOwnership") {
+ } else if (action == "ReleaseOwnership") {
ReleaseOwnership(base::Bind(&TestService::PerformActionResponse,
base::Unretained(this),
method_call, response_sender));