commit fd158294daa6061037ca564e21818a49ee56fc94
author Daniel Erat <derat@chromium.org> Sun Mar 09 21:39:08 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Mar 10 07:47:27 2014 +0000
tree a9333d4033ada0077607169c59abbb0ed50a2ba7
parent 371a613294ea502b01681f15d93a0b4c2c0a8e94

metrics: Make implicit MetricsLibrary d'tor explicit.

Also add 'virtual' and 'OVERRIDE' to overridden methods.

BUG=none
TEST=did a build

Change-Id: Iec71c59853b6ada38b20cea9d0605c3d39e9353f
Reviewed-on: https://chromium-review.googlesource.com/189398
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

metrics/metrics_library.cc

diff --git a/metrics/metrics_library.cc b/metrics/metrics_library.cc
index c53c16b..1214dd0 100644
--- a/metrics/metrics_library.cc
+++ b/metrics/metrics_library.cc
@@ -88,6 +88,8 @@
     : uma_events_file_(NULL),
       consent_file_(kConsentFile) {}
 
+MetricsLibrary::~MetricsLibrary() {}
+
 // We take buffer and buffer_size as parameters in order to simplify testing
 // of various alignments of the |device_name| with |buffer_size|.
 bool MetricsLibrary::IsDeviceMounted(const char* device_name,

metrics/metrics_library.h

diff --git a/metrics/metrics_library.h b/metrics/metrics_library.h
index 4bba96d..e9c6f4b 100644
--- a/metrics/metrics_library.h
+++ b/metrics/metrics_library.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <unistd.h>
 
+#include <base/basictypes.h>
+#include <base/compiler_specific.h>
 #include <base/memory/scoped_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
@@ -29,9 +31,10 @@
 class MetricsLibrary : public MetricsLibraryInterface {
  public:
   MetricsLibrary();
+  virtual ~MetricsLibrary();
 
   // Initializes the library.
-  void Init();
+  virtual void Init() OVERRIDE;
 
   // Returns whether or not the machine is running in guest mode.
   bool IsGuestMode();
@@ -68,18 +71,20 @@
   // 0 is the implicit underflow bucket.
   // [|max|,infinity) is the implicit overflow bucket.
   //
-  // An enumaration histogram requires |max| + 1 number of
+  // An enumeration histogram requires |max| + 1 number of
   // buckets. Note that the memory allocated in Chrome for each
   // 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).
-  bool SendEnumToUMA(const std::string& name, int sample, int max);
+  virtual 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.
-  bool SendSparseToUMA(const std::string& name, int sample);
+  virtual 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
@@ -91,7 +96,7 @@
   // chrome/browser/chromeos/external_metrics.cc.
   //
   // |action| is the user-generated event (e.g., "MuteKeyPressed").
-  bool SendUserActionToUMA(const std::string& action);
+  virtual 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.
@@ -158,6 +163,8 @@
   const char* consent_file_;
 
   scoped_ptr<policy::PolicyProvider> policy_provider_;
+
+  DISALLOW_COPY_AND_ASSIGN(MetricsLibrary);
 };
 
 #endif  // METRICS_LIBRARY_H_