aboutsummaryrefslogtreecommitdiff
path: root/src/commands
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2015-12-15 14:46:47 -0800
committerVitaly Buka <vitalybuka@google.com>2015-12-16 01:32:53 +0000
commit34668e731bb194b443bc0e6029d6d3583f08de28 (patch)
tree977de929eeaf54e264d1693d1a392a161ebf52f5 /src/commands
parentc3bc82a29cdff05d67d3b583ca0bc25df96ab382 (diff)
downloadlibweave-34668e731bb194b443bc0e6029d6d3583f08de28.tar.gz
Reformat
Change-Id: Ia98499f9ada220151b24ecb8b60b02524d700bc4 Reviewed-on: https://weave-review.googlesource.com/1967 Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/cloud_command_proxy_unittest.cc4
-rw-r--r--src/commands/command_instance.h11
-rw-r--r--src/commands/command_queue_unittest.cc4
3 files changed, 9 insertions, 10 deletions
diff --git a/src/commands/cloud_command_proxy_unittest.cc b/src/commands/cloud_command_proxy_unittest.cc
index d3a9965..0e998ef 100644
--- a/src/commands/cloud_command_proxy_unittest.cc
+++ b/src/commands/cloud_command_proxy_unittest.cc
@@ -66,8 +66,8 @@ class CloudCommandProxyTest : public ::testing::Test {
protected:
void SetUp() override {
// Set up the test ComponentManager.
- auto callback =
- [this](const base::Callback<void(ComponentManager::UpdateID)>& call) {
+ auto callback = [this](
+ const base::Callback<void(ComponentManager::UpdateID)>& call) {
return callbacks_.Add(call).release();
};
EXPECT_CALL(component_manager_, MockAddServerStateUpdatedCallback(_))
diff --git a/src/commands/command_instance.h b/src/commands/command_instance.h
index 15f3ac2..b1028d0 100644
--- a/src/commands/command_instance.h
+++ b/src/commands/command_instance.h
@@ -12,8 +12,8 @@
#include <base/macros.h>
#include <base/observer_list.h>
-#include <weave/error.h>
#include <weave/command.h>
+#include <weave/error.h>
namespace base {
class Value;
@@ -72,11 +72,10 @@ class CommandInstance final : public Command {
// The command ID extracted (if present in the JSON object) even if other
// parsing/validation error occurs and command instance is not constructed.
// This is used to report parse failures back to the server.
- static std::unique_ptr<CommandInstance> FromJson(
- const base::Value* value,
- Command::Origin origin,
- std::string* command_id,
- ErrorPtr* error);
+ static std::unique_ptr<CommandInstance> FromJson(const base::Value* value,
+ Command::Origin origin,
+ std::string* command_id,
+ ErrorPtr* error);
std::unique_ptr<base::DictionaryValue> ToJson() const;
diff --git a/src/commands/command_queue_unittest.cc b/src/commands/command_queue_unittest.cc
index 08e8102..b4c5938 100644
--- a/src/commands/command_queue_unittest.cc
+++ b/src/commands/command_queue_unittest.cc
@@ -21,8 +21,8 @@ class CommandQueueTest : public testing::Test {
std::unique_ptr<CommandInstance> CreateDummyCommandInstance(
const std::string& name,
const std::string& id) {
- std::unique_ptr<CommandInstance> cmd{new CommandInstance{
- name, Command::Origin::kLocal, {}}};
+ std::unique_ptr<CommandInstance> cmd{
+ new CommandInstance{name, Command::Origin::kLocal, {}}};
cmd->SetID(id);
return cmd;
}