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

components/history/core/browser/typed_url_syncable_service.h

 // Copyright (c) 2013 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_TYPED_URL_SYNCABLE_SERVICE_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_TYPED_URL_SYNCABLE_SERVICE_H_
 
+#include <stdint.h>
+
 #include <set>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/threading/thread_checker.h"
 #include "components/history/core/browser/history_backend_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/syncable_service.h"
 #include "ui/base/page_transition_types.h"
@@ skipping 67 matching lines @@
   // This is a helper map used only in Merge/Process* functions. The lifetime
   // of the iterator is longer than the map object.
   typedef std::map<GURL, std::pair<syncer::SyncChange::SyncChangeType, URLRow>>
       TypedUrlMap;
 
   // This is a helper map used to associate visit vectors from the history db
   // to the typed urls in the above map.
   typedef std::map<GURL, VisitVector> UrlVisitVectorMap;
 
   // Bitfield returned from MergeUrls to specify the result of a merge.
-  typedef uint32 MergeResult;
+  typedef uint32_t MergeResult;
   static const MergeResult DIFF_NONE = 0;
   static const MergeResult DIFF_UPDATE_NODE = 1 << 0;
   static const MergeResult DIFF_LOCAL_ROW_CHANGED = 1 << 1;
   static const MergeResult DIFF_LOCAL_VISITS_ADDED = 1 << 2;
 
   // Helper method for getting the set of synced urls.
   // Set it as virtual for testing.
   void GetSyncedUrls(std::set<GURL>* urls) const;
 
   // Helper function that clears our error counters (used to reset stats after
@@ skipping 127 matching lines @@
 
   ScopedObserver<history::HistoryBackend, history::HistoryBackendObserver>
       history_backend_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TypedUrlSyncableService);
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_TYPED_URL_SYNCABLE_SERVICE_H_