Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

components/sync/driver/model_association_manager.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_association_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 364 matching lines @@
 
   timer_.Stop();
 
   // Treat any unfinished types as having errors.
   desired_types_.RemoveAll(associating_types_);
   for (DataTypeController::TypeMap::const_iterator it = controllers_->begin();
        it != controllers_->end(); ++it) {
     DataTypeController* dtc = (*it).second.get();
     if (associating_types_.Has(dtc->type()) &&
         dtc->state() != DataTypeController::NOT_RUNNING) {
+      // TODO(wychen): enum uma should be strongly typed. crbug.com/661401
       UMA_HISTOGRAM_ENUMERATION("Sync.ConfigureFailed",
                                 ModelTypeToHistogramInt(dtc->type()),
-                                MODEL_TYPE_COUNT);
+                                static_cast<int>(MODEL_TYPE_COUNT));
       StopDatatype(SyncError(FROM_HERE, SyncError::DATATYPE_ERROR,
                              "Association timed out.", dtc->type()),
                    dtc);
     }
   }
 
   DataTypeManager::ConfigureResult result(configure_status_, requested_types_);
 
   // Need to reset state before invoking delegate in order to avoid re-entrancy
   // issues (delegate may trigger a reconfiguration).
@@ skipping 20 matching lines @@
       // At least one type is not ready.
       return;
     }
   }
 
   notified_about_ready_for_configure_ = true;
   delegate_->OnAllDataTypesReadyForConfigure();
 }
 
 }  // namespace syncer