Switch to standard integer types in components/, part 2 of 4.

components/history/core/browser/history_model_worker.h

 // 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.
 
 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MODEL_WORKER_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MODEL_WORKER_H_
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 
 namespace history {
 class HistoryService;
 }
@@ skipping 32 matching lines @@
   // Helper object to make sure we don't leave tasks running on the history
   // thread.
   scoped_ptr<base::CancelableTaskTracker> cancelable_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryModelWorker);
 };
 
 }  // namespace browser_sync
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MODEL_WORKER_H_