Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

chrome/browser/diagnostics/diagnostics_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
@@ skipping 41 matching lines @@
 }
 
 void DiagnosticsTest::RecordOutcome(int outcome_code,
                                     const std::string& additional_info,
                                     DiagnosticsModel::TestResult result) {
   end_time_ = base::Time::Now();
   outcome_code_ = outcome_code;
   additional_info_ = additional_info;
   result_ = result;
 #if defined(OS_CHROMEOS)  // Only collecting UMA stats on ChromeOS
+  DiagnosticsTestId id = static_cast<DiagnosticsTestId>(GetId());
   if (result_ == DiagnosticsModel::TEST_OK) {
     // Record individual test success.
-    RecordUMATestResult(static_cast<DiagnosticsTestId>(GetId()),
-                        RESULT_SUCCESS);
+    RecordUMATestResult(id, RESULT_SUCCESS);
   } else if (result_ == DiagnosticsModel::TEST_FAIL_CONTINUE ||
              result_ == DiagnosticsModel::TEST_FAIL_STOP) {
     // Record test failure in summary histogram.
-    UMA_HISTOGRAM_ENUMERATION(
-        "Diagnostics.TestFailures", GetId(), DIAGNOSTICS_TEST_ID_COUNT);
+    UMA_HISTOGRAM_ENUMERATION("Diagnostics.TestFailures", id,
+                              DIAGNOSTICS_TEST_ID_COUNT);
     // Record individual test failure.
-    RecordUMATestResult(static_cast<DiagnosticsTestId>(GetId()),
-                        RESULT_FAILURE);
+    RecordUMATestResult(id, RESULT_FAILURE);
   }
 #endif
 }
 
 // static
 base::FilePath DiagnosticsTest::GetUserDefaultProfileDir() {
   base::FilePath path;
   if (!PathService::Get(chrome::DIR_USER_DATA, &path))
     return base::FilePath();
   return path.AppendASCII(chrome::kInitialProfile);
@@ skipping 19 matching lines @@
 
 base::Time DiagnosticsTest::GetStartTime() const { return start_time_; }
 
 base::Time DiagnosticsTest::GetEndTime() const { return end_time_; }
 
 bool DiagnosticsTest::RecoveryImpl(DiagnosticsModel::Observer* observer) {
   return true;
 }
 
 }  // namespace diagnostics