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

chrome/browser/media_galleries/gallery_watch_manager.h

 // Copyright 2014 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_GALLERY_WATCH_MANAGER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_
 
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
 #include "components/storage_monitor/removable_storage_observer.h"
 
 class GalleryWatchManagerObserver;
 
@@ skipping 138 matching lines @@
   // Removes watches when a browser context is shut down as watches contain raw
   // pointers.
   BrowserContextSubscriptionMap browser_context_subscription_map_;
 
   base::WeakPtrFactory<GalleryWatchManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GalleryWatchManager);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_