Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

components/sync/driver/data_type_manager_impl.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/data_type_manager_impl.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 236 matching lines @@
 void DataTypeManagerImpl::Restart(ConfigureReason reason) {
   DVLOG(1) << "Restarting...";
 
   // Only record the type histograms for user-triggered configurations or
   // restarts.
   if (reason == CONFIGURE_REASON_RECONFIGURATION ||
       reason == CONFIGURE_REASON_NEW_CLIENT ||
       reason == CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE) {
     for (ModelTypeSet::Iterator iter = last_requested_types_.First();
          iter.Good(); iter.Inc()) {
+      // TODO(wychen): enum uma should be strongly typed. crbug.com/661401
       UMA_HISTOGRAM_ENUMERATION("Sync.ConfigureDataTypes",
                                 ModelTypeToHistogramInt(iter.Get()),
-                                MODEL_TYPE_COUNT);
+                                static_cast<int>(MODEL_TYPE_COUNT));
     }
   }
 
   // Check for new or resolved data type crypto errors.
   if (encryption_handler_->IsPassphraseRequired()) {
     ModelTypeSet encrypted_types = encryption_handler_->GetEncryptedDataTypes();
     encrypted_types.RetainAll(last_requested_types_);
     encrypted_types.RemoveAll(data_type_status_table_.GetCryptoErrorTypes());
     DataTypeStatusTable::TypeErrorMap crypto_errors =
         GenerateCryptoErrorsForTypes(encrypted_types);
@@ skipping 589 matching lines @@
 
 void DataTypeManagerImpl::SetTypeDownloaded(ModelType type, bool downloaded) {
   if (downloaded) {
     downloaded_types_.Put(type);
   } else {
     downloaded_types_.Remove(type);
   }
 }
 
 }  // namespace syncer