commit 4e59634509d6d3dd4c9423e0c48c62c09b8cbe15
author Alex Vakulenko <avakulenko@chromium.org> Wed Jul 30 11:48:30 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Aug 01 04:19:03 2014 +0000
tree 2a563e691c126713c28fdc0c7a9a8f29dbb44058
parent e6cfd64e6a819dc7e5e2d32facb3e1e357fbecb2

metrics: fix remaining linter issues

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

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

Change-Id: I589be238c97c38f985f24ffe26d2cdf259c96760
Reviewed-on: https://chromium-review.googlesource.com/210505
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

metrics/uploader/system_profile_cache.cc

diff --git a/metrics/uploader/system_profile_cache.cc b/metrics/uploader/system_profile_cache.cc
index 0090d38..4b79c73 100644
--- a/metrics/uploader/system_profile_cache.cc
+++ b/metrics/uploader/system_profile_cache.cc
@@ -12,8 +12,8 @@
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "components/metrics/metrics_log_base.h"
+#include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "metrics/persistent_integer.h"
 #include "vboot/crossystem.h"
 

metrics/uploader/upload_service.cc

diff --git a/metrics/uploader/upload_service.cc b/metrics/uploader/upload_service.cc
index 5e05dcf..62f5d92 100644
--- a/metrics/uploader/upload_service.cc
+++ b/metrics/uploader/upload_service.cc
@@ -16,8 +16,8 @@
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/sha1.h"
-#include "components/metrics/chromeos/serialization_utils.h"
 #include "components/metrics/chromeos/metric_sample.h"
+#include "components/metrics/chromeos/serialization_utils.h"
 #include "gflags/gflags.h"
 #include "uploader/curl_sender.h"
 #include "uploader/metrics_log.h"

metrics/uploader/upload_service_test.cc

diff --git a/metrics/uploader/upload_service_test.cc b/metrics/uploader/upload_service_test.cc
index efc382e..9e5bd8d 100644
--- a/metrics/uploader/upload_service_test.cc
+++ b/metrics/uploader/upload_service_test.cc
@@ -5,19 +5,19 @@
 #include <gtest/gtest.h>
 
 #include "base/at_exit.h"
-#include "base/logging.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/logging.h"
 #include "base/sys_info.h"
 #include "components/metrics/chromeos/metric_sample.h"
 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
-#include "components/metrics/proto/system_profile.pb.h"
 #include "components/metrics/proto/histogram_event.pb.h"
+#include "components/metrics/proto/system_profile.pb.h"
 #include "uploader/metrics_log.h"
-#include "uploader/upload_service.h"
-#include "uploader/mock/sender_mock.h"
 #include "uploader/mock/mock_system_profile_setter.h"
+#include "uploader/mock/sender_mock.h"
 #include "uploader/system_profile_cache.h"
+#include "uploader/upload_service.h"
 
 class UploadServiceTest : public testing::Test {
  protected: