[Sync] ModelTypeCount UMA doesn't include server-side only unapplied entries

sync/syncable/directory_backing_store.cc

 // Copyright 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 "sync/syncable/directory_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 638 matching lines @@
 
 bool DirectoryBackingStore::LoadEntries(Directory::MetahandlesMap* handles_map,
                                         MetahandleSet* metahandles_to_purge) {
   string select;
   select.reserve(kUpdateStatementBufferSize);
   select.append("SELECT ");
   AppendColumnList(&select);
   select.append(" FROM metas");
   int total_specifics_copies = 0;
   int model_type_entry_count[MODEL_TYPE_COUNT];
-  for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
+  for (int i = 0; i < MODEL_TYPE_COUNT; ++i) {
     model_type_entry_count[i] = 0;
   }
 
   sql::Statement s(db_->GetUniqueStatement(select.c_str()));
 
   while (s.Step()) {
     scoped_ptr<EntryKernel> kernel = UnpackEntry(&s, &total_specifics_copies);
     // A null kernel is evidence of external data corruption.
     if (!kernel)
       return false;
 
     int64_t handle = kernel->ref(META_HANDLE);
     if (SafeToPurgeOnLoading(*kernel)) {
       metahandles_to_purge->insert(handle);
     } else {
-      ++model_type_entry_count[kernel->GetModelType()];
+      ModelType model_type = kernel->GetModelType();
+      if (!IsRealDataType(model_type)) {
+        model_type = kernel->GetServerModelType();
+      }
+      ++model_type_entry_count[model_type];
       (*handles_map)[handle] = kernel.release();
     }
   }
 
   UploadModelTypeEntryCount(total_specifics_copies, model_type_entry_count);
 
   return s.Succeeded();
 }
 
 bool DirectoryBackingStore::SafeToPurgeOnLoading(
@@ skipping 1060 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(!catastrophic_error_handler.is_null());
   catastrophic_error_handler_ = catastrophic_error_handler;
   sql::Connection::ErrorCallback error_callback =
       base::Bind(&OnSqliteError, catastrophic_error_handler_);
   db_->set_error_callback(error_callback);
 }
 
 }  // namespace syncable
 }  // namespace syncer