commit e8a8e30b25782048a766f9d8ac9133406a013f47
author Alex Vakulenko <avakulenko@chromium.org> Thu Aug 14 12:56:21 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Aug 16 05:26:56 2014 +0000
tree 8b7e400770b37a4c4e397c08b324904ac29b9965
parent f05ab40ab949c1052d1d443f841416f1480924e4

metrics: Replace 'OVERRIDE' with 'override' and fix linter

Replace OVERRIDE macro with native C++ 'override' keyword.
Also fixed the style issue of using both 'override' and 'virtual'
on member function overrides. Only one is required and cpplint
complains if both are specified now.

And since gobi-chromo-plugin is the only project that uses
libmetrics and is not C++11 yet, enabled C++11 features
in its makefile to allow for the 'override' keywords to
compile in the included metrics/metrics_library.h header.

BUG=None
TEST=USE="cellular buffet" ./build_packages

Change-Id: I28dace6dc4bcb07386632eaed890ce41564e8144
Reviewed-on: https://chromium-review.googlesource.com/212494
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>

metrics/metrics_library.h

diff --git a/metrics/metrics_library.h b/metrics/metrics_library.h
index 9e4be89..97b2b72 100644
--- a/metrics/metrics_library.h
+++ b/metrics/metrics_library.h
@@ -34,7 +34,7 @@
   virtual ~MetricsLibrary();
 
   // Initializes the library.
-  virtual void Init() OVERRIDE;
+  void Init() override;
 
   // Returns whether or not the machine is running in guest mode.
   bool IsGuestMode();
@@ -76,15 +76,13 @@
   // histogram is proportional to the number of buckets. Therefore, it
   // is strongly recommended to keep this number low (e.g., 50 is
   // normal, while 100 is high).
-  virtual bool SendEnumToUMA(const std::string& name,
-                             int sample,
-                             int max) OVERRIDE;
+  bool SendEnumToUMA(const std::string& name, int sample, int max) override;
 
   // Sends sparse histogram sample to Chrome for transport to UMA.  Returns
   // true on success.
   //
   // |sample| is the 32-bit integer value to be recorded.
-  virtual bool SendSparseToUMA(const std::string& name, int sample) OVERRIDE;
+  bool SendSparseToUMA(const std::string& name, int sample) override;
 
   // Sends a user action to Chrome for transport to UMA and returns true on
   // success. This method results in the equivalent of an asynchronous
@@ -96,7 +94,7 @@
   // chrome/browser/chromeos/external_metrics.cc.
   //
   // |action| is the user-generated event (e.g., "MuteKeyPressed").
-  virtual bool SendUserActionToUMA(const std::string& action) OVERRIDE;
+  bool SendUserActionToUMA(const std::string& action) override;
 
   // Sends a signal to UMA that a crash of the given |crash_kind|
   // has occurred.  Used by UMA to generate stability statistics.