Switch to standard integer types in chrome/.

chrome/utility/media_galleries/iphoto_library_parser.cc

 // 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.
 
 #include "chrome/utility/media_galleries/iphoto_library_parser.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/utility/media_galleries/iapps_xml_utils.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 namespace iphoto {
 
 namespace {
 
 struct PhotoInfo {
-  uint64 id;
+  uint64_t id;
   base::FilePath location;
   base::FilePath original_location;
 };
 
 struct AlbumInfo {
-  std::set<uint64> photo_ids;
+  std::set<uint64_t> photo_ids;
   std::string name;
-  uint64 id;
+  uint64_t id;
 };
 
 class PhotosXmlDictReader : public iapps::XmlDictReader {
  public:
   PhotosXmlDictReader(XmlReader* reader, PhotoInfo* photo_info)
     : iapps::XmlDictReader(reader), photo_info_(photo_info) {}
 
   bool HandleKeyImpl(const std::string& key) override {
     if (key == "ImagePath") {
       std::string value;
@@ skipping 16 matching lines @@
  private:
   PhotoInfo* photo_info_;
 };
 
 // Contents of the album 'KeyList' key are
 // <array>
 //  <string>1</string>
 //  <string>2</string>
 //  <string>3</string>
 // </array>
-bool ReadStringArray(XmlReader* reader, std::set<uint64>* photo_ids) {
+bool ReadStringArray(XmlReader* reader, std::set<uint64_t>* photo_ids) {
   if (reader->NodeName() != "array")
     return false;
 
   // Advance past the array node and into the body of the array.
   if (!reader->Read())
     return false;
 
   int array_content_depth = reader->Depth();
 
   while (iapps::SeekToNodeAtCurrentDepth(reader, "string")) {
     if (reader->Depth() != array_content_depth)
       return false;
     std::string photo_id;
     if (!iapps::ReadString(reader, &photo_id))
       continue;
-    uint64 id;
+    uint64_t id;
     if (!base::StringToUint64(photo_id, &id))
       continue;
     photo_ids->insert(id);
   }
 
   return true;
 }
 
 class AlbumXmlDictReader : public iapps::XmlDictReader {
  public:
@@ skipping 52 matching lines @@
   bool errors = false;
   while (reader->Depth() >= photos_dict_depth) {
     if (!iapps::SeekToNodeAtCurrentDepth(reader, "key"))
       break;
 
     std::string key;
     if (!reader->ReadElementContent(&key)) {
       errors = true;
       break;
     }
-    uint64 id;
+    uint64_t id;
     bool id_valid = base::StringToUint64(key, &id);
 
     if (!id_valid ||
         reader->Depth() != photos_dict_depth) {
       errors = true;
       break;
     }
     if (!iapps::SeekToNodeAtCurrentDepth(reader, "dict")) {
       errors = true;
       break;
@@ skipping 88 matching lines @@
     return false;
 
   if (!iapps::SeekToNodeAtCurrentDepth(&reader, "dict"))
     return false;
 
   IPhotoLibraryXmlDictReader dict_reader(&reader, &library_);
   return dict_reader.Read();
 }
 
 }  // namespace iphoto