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

chrome/browser/media_galleries/fileapi/iphoto_data_provider.h

 // Copyright 2013 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_FILEAPI_IPHOTO_DATA_PROVIDER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_IPHOTO_DATA_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/media_galleries/fileapi/iapps_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/safe_iapps_library_parser.h"
 #include "chrome/common/media_galleries/iphoto_library.h"
 
 namespace iphoto {
 
 // This class is the holder for iPhoto parsed data. Given a path to the iPhoto
 // library XML file it will read it in, parse the data, and provide convenient
 // methods to access it.  When the file changes, it will update the data.
@@ skipping 41 matching lines @@
   scoped_refptr<iapps::SafeIAppsLibraryParser> xml_parser_;
 
   base::WeakPtrFactory<IPhotoDataProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IPhotoDataProvider);
 };
 
 }  // namespace iphoto
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_IPHOTO_DATA_PROVIDER_H_