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

chrome/browser/media_galleries/media_galleries_preferences_unittest.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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "components/storage_monitor/test_storage_monitor.h"
@@ skipping 223 matching lines @@
     EXPECT_EQ(in_expectation->second.video_count, actual.video_count);
     EXPECT_EQ(
         in_expectation->second.default_gallery_type,
         actual.default_gallery_type);
   }
 
   MediaGalleriesPreferences* gallery_prefs() {
     return gallery_prefs_.get();
   }
 
-  uint64 default_galleries_count() {
-    return default_galleries_count_;
-  }
+  uint64_t default_galleries_count() { return default_galleries_count_; }
 
   void AddGalleryExpectation(MediaGalleryPrefId id, base::string16 display_name,
                              std::string device_id,
                              base::FilePath relative_path,
                              MediaGalleryPrefInfo::Type type) {
     expected_galleries_[id].pref_id = id;
     expected_galleries_[id].display_name = display_name;
     expected_galleries_[id].device_id = device_id;
     expected_galleries_[id].path = relative_path.NormalizePathSeparators();
     expected_galleries_[id].type = type;
@@ skipping 94 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 
   TestStorageMonitor monitor_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<MediaGalleriesPreferences> gallery_prefs_;
 
-  uint64 default_galleries_count_;
+  uint64_t default_galleries_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferencesTest);
 };
 
 TEST_F(MediaGalleriesPreferencesTest, GalleryManagement) {
   MediaGalleryPrefId auto_id, user_added_id, scan_id, id;
   base::FilePath path;
   base::FilePath relative_path;
   Verify();
 
@@ skipping 1134 matching lines @@
                MediaGalleryPrefInfo::DefaultGalleryType::kNotDefault) {
       found_user_added = true;
     }
   }
 
   EXPECT_TRUE(found_music);
   EXPECT_TRUE(found_pictures);
   EXPECT_TRUE(found_videos);
   EXPECT_TRUE(found_user_added);
 }