diff options
Diffstat (limited to 'chrome/browser/media_galleries/media_galleries_preferences_unittest.cc')
| -rw-r--r-- | chrome/browser/media_galleries/media_galleries_preferences_unittest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index 3c8775e..9453f29 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -6,10 +6,13 @@ #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" @@ -17,6 +20,7 @@ #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" @@ -260,9 +264,7 @@ class MediaGalleriesPreferencesTest : public testing::Test { 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, @@ -377,7 +379,7 @@ class MediaGalleriesPreferencesTest : public testing::Test { scoped_ptr<TestingProfile> profile_; scoped_ptr<MediaGalleriesPreferences> gallery_prefs_; - uint64 default_galleries_count_; + uint64_t default_galleries_count_; DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferencesTest); }; |