diff --git a/update_manager/fake_updater_provider.h b/update_manager/fake_updater_provider.h
index 0105801..52b64a0 100644
--- a/update_manager/fake_updater_provider.h
+++ b/update_manager/fake_updater_provider.h
@@ -67,24 +67,33 @@
   }
 
  private:
-  FakeVariable<base::Time> var_updater_started_time_{
-      "updater_started_time", kVariableModePoll};
-  FakeVariable<base::Time> var_last_checked_time_{
-      "last_checked_time", kVariableModePoll};
-  FakeVariable<base::Time> var_update_completed_time_{
-      "update_completed_time", kVariableModePoll};
-  FakeVariable<double> var_progress_{"progress", kVariableModePoll};
-  FakeVariable<Stage> var_stage_{"stage", kVariableModePoll};
-  FakeVariable<std::string> var_new_version_{"new_version", kVariableModePoll};
-  FakeVariable<int64_t> var_payload_size_{"payload_size", kVariableModePoll};
-  FakeVariable<std::string> var_curr_channel_{
-      "curr_channel", kVariableModePoll};
-  FakeVariable<std::string> var_new_channel_{"new_channel", kVariableModePoll};
-  FakeVariable<bool> var_p2p_enabled_{"p2p_enabled", kVariableModePoll};
-  FakeVariable<bool> var_cellular_enabled_{
-      "cellular_enabled", kVariableModePoll};
-  FakeVariable<unsigned int> var_consecutive_failed_update_checks_{
-      "consecutive_failed_update_checks", kVariableModePoll};
+  FakeVariable<base::Time>
+      var_updater_started_time_{  // NOLINT(whitespace/braces)
+    "updater_started_time", kVariableModePoll};
+  FakeVariable<base::Time> var_last_checked_time_{  // NOLINT(whitespace/braces)
+    "last_checked_time", kVariableModePoll};
+  FakeVariable<base::Time>
+      var_update_completed_time_{  // NOLINT(whitespace/braces)
+    "update_completed_time", kVariableModePoll};
+  FakeVariable<double> var_progress_{  // NOLINT(whitespace/braces)
+    "progress", kVariableModePoll};
+  FakeVariable<Stage> var_stage_{  // NOLINT(whitespace/braces)
+    "stage", kVariableModePoll};
+  FakeVariable<std::string> var_new_version_{  // NOLINT(whitespace/braces)
+    "new_version", kVariableModePoll};
+  FakeVariable<int64_t> var_payload_size_{  // NOLINT(whitespace/braces)
+    "payload_size", kVariableModePoll};
+  FakeVariable<std::string> var_curr_channel_{  // NOLINT(whitespace/braces)
+    "curr_channel", kVariableModePoll};
+  FakeVariable<std::string> var_new_channel_{  // NOLINT(whitespace/braces)
+    "new_channel", kVariableModePoll};
+  FakeVariable<bool> var_p2p_enabled_{  // NOLINT(whitespace/braces)
+    "p2p_enabled", kVariableModePoll};
+  FakeVariable<bool> var_cellular_enabled_{  // NOLINT(whitespace/braces)
+    "cellular_enabled", kVariableModePoll};
+  FakeVariable<unsigned int>
+      var_consecutive_failed_update_checks_{  // NOLINT(whitespace/braces)
+    "consecutive_failed_update_checks", kVariableModePoll};
 
   DISALLOW_COPY_AND_ASSIGN(FakeUpdaterProvider);
 };
diff --git a/update_manager/real_updater_provider.cc b/update_manager/real_updater_provider.cc
index 7863019..6445972 100644
--- a/update_manager/real_updater_provider.cc
+++ b/update_manager/real_updater_provider.cc
@@ -141,8 +141,10 @@
   {update_engine::kUpdateStatusVerifying, Stage::kVerifying},
   {update_engine::kUpdateStatusFinalizing, Stage::kFinalizing},
   {update_engine::kUpdateStatusUpdatedNeedReboot, Stage::kUpdatedNeedReboot},
-  {update_engine::kUpdateStatusReportingErrorEvent,
-   Stage::kReportingErrorEvent},
+  {  // NOLINT(whitespace/braces)
+    update_engine::kUpdateStatusReportingErrorEvent,
+    Stage::kReportingErrorEvent
+  },
   {update_engine::kUpdateStatusAttemptingRollback, Stage::kAttemptingRollback},
 };
 
@@ -310,8 +312,8 @@
 };
 
 // A variable returning the number of consecutive failed update checks.
-class ConsecutiveFailedUpdateChecksVariable :
-    public UpdaterVariableBase<unsigned int> {
+class ConsecutiveFailedUpdateChecksVariable
+    : public UpdaterVariableBase<unsigned int> {
  public:
   using UpdaterVariableBase<unsigned int>::UpdaterVariableBase;