sync: Define histogram ints for model types

chrome/browser/sync/glue/model_association_manager.cc

 // Copyright (c) 2012 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/sync/glue/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
-
+#include "sync/internal_api/public/base/model_type.h"
 
 using content::BrowserThread;
 using syncer::ModelTypeSet;
 
 namespace browser_sync {
 // The amount of time we wait for a datatype to load. If the type has
 // not finished loading we move on to the next type. Once this type
 // finishes loading we will do a configure to associate this type. Note
 // that in most cases types finish loading before this timeout.
 const int64 kDataTypeLoadWaitTimeInSeconds = 120;
@@ skipping 268 matching lines @@
   return found_any;
 }
 
 void ModelAssociationManager::AppendToFailedDatatypesAndLogError(
     DataTypeController::StartResult result,
     const syncer::SyncError& error) {
   failed_datatypes_info_.push_back(error);
   LOG(ERROR) << "Failed to associate models for "
              << syncer::ModelTypeToString(error.type());
   UMA_HISTOGRAM_ENUMERATION("Sync.ConfigureFailed",
-                            error.type(),
+                            ModelTypeToHistogramInt(error.type()),
                             syncer::MODEL_TYPE_COUNT);
 }
 
 void ModelAssociationManager::TypeStartCallback(
     DataTypeController::StartResult start_result,
     const syncer::SyncMergeResult& local_merge_result,
     const syncer::SyncMergeResult& syncer_merge_result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   TRACE_EVENT_END0("sync", "ModelAssociation");
 
@@ skipping 237 matching lines @@
   }
   return result;
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync