Switch to standard integer types in sync/.

sync/sessions/status_controller.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 "sync/sessions/status_controller.h"
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
 namespace sessions {
 
 StatusController::StatusController() {
 }
 
 StatusController::~StatusController() {}
@@ skipping 100 matching lines @@
 int StatusController::TotalNumConflictingItems() const {
   int sum = 0;
   sum += num_encryption_conflicts();
   sum += num_hierarchy_conflicts();
   sum += num_server_conflicts();
   return sum;
 }
 
 }  // namespace sessions
 }  // namespace syncer