Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

components/sync/driver/model_type_controller.cc

 // Copyright 2014 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 "components/sync/driver/model_type_controller.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 21 matching lines @@
     const ModelErrorHandler& error_handler,
     const ModelTypeChangeProcessor::StartCallback& callback,
     ModelTypeSyncBridge* bridge) {
   bridge->OnSyncStarting(std::move(error_handler), std::move(callback));
 }
 
 void ReportError(ModelType model_type,
                  scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
                  const ModelErrorHandler& error_handler,
                  const ModelError& error) {
+  // TODO(wychen): enum uma should be strongly typed. crbug.com/661401
   UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeRunFailures",
                             ModelTypeToHistogramInt(model_type),
-                            MODEL_TYPE_COUNT);
+                            static_cast<int>(MODEL_TYPE_COUNT));
   ui_thread->PostTask(error.location(), base::Bind(error_handler, error));
 }
 
 // This function allows us to return a Callback using Bind that returns the
 // given |arg|. This function itself does nothing.
 base::WeakPtr<ModelTypeSyncBridge> ReturnCapturedBridge(
     base::WeakPtr<ModelTypeSyncBridge> arg) {
   return arg;
 }
 
@@ skipping 188 matching lines @@
 
 void ModelTypeController::ReportModelError(const ModelError& error) {
   DCHECK(CalledOnValidThread());
   LoadModelsDone(UNRECOVERABLE_ERROR,
                  SyncError(error.location(), SyncError::DATATYPE_ERROR,
                            error.message(), type()));
 }
 
 void ModelTypeController::RecordStartFailure(ConfigureResult result) const {
   DCHECK(CalledOnValidThread());
+  // TODO(wychen): enum uma should be strongly typed. crbug.com/661401
   UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeStartFailures",
-                            ModelTypeToHistogramInt(type()), MODEL_TYPE_COUNT);
+                            ModelTypeToHistogramInt(type()),
+                            static_cast<int>(MODEL_TYPE_COUNT));
 #define PER_DATA_TYPE_MACRO(type_str)                                    \
   UMA_HISTOGRAM_ENUMERATION("Sync." type_str "ConfigureFailure", result, \
                             MAX_CONFIGURE_RESULT);
   SYNC_DATA_TYPE_HISTOGRAM(type());
 #undef PER_DATA_TYPE_MACRO
 }
 
 BridgeProvider ModelTypeController::GetBridgeProvider() {
   // Get the bridge eagerly, and capture the weak pointer.
   base::WeakPtr<ModelTypeSyncBridge> bridge =
       sync_client_->GetSyncBridgeForModelType(type());
   return base::Bind(&ReturnCapturedBridge, bridge);
 }
 
 void ModelTypeController::PostBridgeTask(
     const tracked_objects::Location& location,
     const BridgeTask& task) {
   model_thread_->PostTask(
       location, base::Bind(&RunBridgeTask, GetBridgeProvider(), task));
 }
 }  // namespace syncer