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

components/dom_distiller/core/dom_distiller_model.h

 // Copyright 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_DOM_DISTILLER_CORE_DOM_DISTILLER_MODEL_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_MODEL_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/id_map.h"
+#include "base/macros.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_change_processor.h"  // syncer::SyncChangeList
 #include "sync/api/sync_data.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 // This stores the in-memory model of the DOM distiller list. Entries can be
 // looked up by URL or by entry_id.
@@ skipping 27 matching lines @@
   // the model to |changes_applied|. If conflict resolution does not apply the
   // requested change, then adds the "diff" between what was requested and what
   // was actually applied to |changes_missing|.
   // Note: Currently conflicts are resolved by just applying the requested
   // change. This means nothing will be added to |changes_missing|.
   void ApplyChangesToModel(const syncer::SyncChangeList& change_list,
                            syncer::SyncChangeList* changes_applied,
                            syncer::SyncChangeList* changes_missing);
 
  private:
-  typedef int32 KeyType;
+  typedef int32_t KeyType;
   typedef base::hash_map<KeyType, ArticleEntry> EntryMap;
   typedef base::hash_map<std::string, KeyType> StringToKeyMap;
 
   void AddEntry(const ArticleEntry& entry);
   void RemoveEntry(const ArticleEntry& entry);
 
   // Lookup an entry's key by ID or URL. Returns whether a corresponding key was
   // found. On success, if |key| is not null, it will contain the entry.
   bool GetKeyById(const std::string& entry_id, KeyType* key) const;
   bool GetKeyByUrl(const GURL& url, KeyType* key) const;
@@ skipping 10 matching lines @@
   EntryMap entries_;
   StringToKeyMap url_to_key_map_;
   StringToKeyMap entry_id_to_key_map_;
 
   DISALLOW_COPY_AND_ASSIGN(DomDistillerModel);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_MODEL_H_