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

chrome/browser/media_galleries/media_galleries_preferences.cc

 // 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.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
+#include <stddef.h>
+
 #include "base/base_paths_posix.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media_galleries/fileapi/iapps_finder.h"
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 806 matching lines @@
   return MediaStorageUtil::FindDevicePathById(it->second.device_id);
 }
 
 MediaGalleryPrefId MediaGalleriesPreferences::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) {
   DCHECK(IsInitialized());
   return AddOrUpdateGalleryInternal(
       device_id,
       base::string16(),
       relative_path,
       type,
       volume_label,
       vendor_name,
       model_name,
       total_size_in_bytes,
       last_attach_time,
       true,
       audio_count,
       image_count,
       video_count,
       kCurrentPrefsVersion,
       MediaGalleryPrefInfo::kNotDefault);
 }
 
 MediaGalleryPrefId MediaGalleriesPreferences::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,
-    base::Time last_attach_time, bool volume_metadata_valid,
-    int audio_count, int image_count, int video_count, int prefs_version,
+    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_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) {
   DCHECK(type == MediaGalleryPrefInfo::kUserAdded ||
          type == MediaGalleryPrefInfo::kAutoDetected ||
          type == MediaGalleryPrefInfo::kScanResult);
   base::FilePath normalized_relative_path =
       relative_path.NormalizePathSeparators();
   MediaGalleryPrefIdSet galleries_on_device =
     LookUpGalleriesByDeviceId(device_id);
 
   for (MediaGalleryPrefIdSet::const_iterator pref_id_it =
@@ skipping 397 matching lines @@
   return true;
 }
 
 const MediaGalleriesPrefInfoMap& MediaGalleriesPreferences::known_galleries()
     const {
   DCHECK(IsInitialized());
   return known_galleries_;
 }
 
 base::Time MediaGalleriesPreferences::GetLastScanCompletionTime() const {
-  int64 last_scan_time_internal =
+  int64_t last_scan_time_internal =
       profile_->GetPrefs()->GetInt64(prefs::kMediaGalleriesLastScanTime);
   return base::Time::FromInternalValue(last_scan_time_internal);
 }
 
 void MediaGalleriesPreferences::SetLastScanCompletionTime(
     const base::Time& time) {
   profile_->GetPrefs()->SetInt64(prefs::kMediaGalleriesLastScanTime,
                                  time.ToInternalValue());
 }
 
@@ skipping 135 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }