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

chrome/browser/media_galleries/media_galleries_preferences.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/storage_monitor/removable_storage_observer.h"
 
 class Profile;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace extensions {
 class Extension;
 class ExtensionPrefs;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-typedef uint64 MediaGalleryPrefId;
+typedef uint64_t MediaGalleryPrefId;
 const MediaGalleryPrefId kInvalidMediaGalleryPrefId = 0;
 
 const char kMediaGalleriesPrefsVersionKey[] = "preferencesVersion";
 const char kMediaGalleriesDefaultGalleryTypeKey[] = "defaultGalleryType";
 
 struct MediaGalleryPermission {
   MediaGalleryPrefId pref_id;
   bool has_permission;
 };
 
@@ skipping 47 matching lines @@
   // Vendor name for the volume/device on which the gallery is located.
   // Will be empty if unknown.
   base::string16 vendor_name;
 
   // Model name for the volume/device on which the gallery is located.
   // Will be empty if unknown.
   base::string16 model_name;
 
   // The capacity in bytes of the volume/device on which the gallery is
   // located. Will be zero if unknown.
-  uint64 total_size_in_bytes;
+  uint64_t total_size_in_bytes;
 
   // If the gallery is on a removable device, the time that device was last
   // attached. It is stored in preferences by the base::Time internal value,
   // which is microseconds since the epoch.
   base::Time last_attach_time;
 
   // Set to true if the volume metadata fields (volume_label, vendor_name,
   // model_name, total_size_in_bytes) were set. False if these fields were
   // never written.
   bool volume_metadata_valid;
@@ skipping 109 matching lines @@
 
   // Teaches the registry about a new gallery. If the gallery is in a
   // blacklisted state, it is unblacklisted. |type| should not be a blacklisted
   // type. Returns the gallery's pref id.
   MediaGalleryPrefId AddGallery(const std::string& device_id,
                                 const base::FilePath& relative_path,
                                 MediaGalleryPrefInfo::Type type,
                                 const base::string16& volume_label,
                                 const base::string16& vendor_name,
                                 const base::string16& model_name,
-                                uint64 total_size_in_bytes,
+                                uint64_t total_size_in_bytes,
                                 base::Time last_attach_time,
                                 int audio_count,
                                 int image_count,
                                 int video_count);
 
   // Teach the registry about a gallery simply from the path. If the gallery is
   // in a blacklisted state, it is unblacklisted. |type| should not be a
   // blacklisted type. Returns the gallery's pref id.
   MediaGalleryPrefId AddGalleryByPath(const base::FilePath& path,
                                       MediaGalleryPrefInfo::Type type);
@@ skipping 76 matching lines @@
   // existing gallery with the given device_id if one exists.
   // TODO(orenb): Simplify this and reduce the number of parameters.
   MediaGalleryPrefId AddOrUpdateGalleryInternal(
       const std::string& device_id,
       const base::string16& display_name,
       const base::FilePath& relative_path,
       MediaGalleryPrefInfo::Type type,
       const base::string16& volume_label,
       const base::string16& vendor_name,
       const base::string16& model_name,
-      uint64 total_size_in_bytes,
+      uint64_t total_size_in_bytes,
       base::Time last_attach_time,
       bool volume_metadata_valid,
       int audio_count,
       int image_count,
       int video_count,
       int prefs_version,
       MediaGalleryPrefInfo::DefaultGalleryType default_gallery_type);
 
   void EraseOrBlacklistGalleryById(MediaGalleryPrefId id, bool erase);
 
@@ skipping 51 matching lines @@
   DeviceIdPrefIdsMap device_map_;
 
   base::ObserverList<GalleryChangeObserver> gallery_change_observers_;
 
   base::WeakPtrFactory<MediaGalleriesPreferences> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferences);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_