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

chrome/browser/media_galleries/fileapi/iapps_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_IAPPS_DATA_PROVIDER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_IAPPS_DATA_PROVIDER_H_
 
 #include <map>
 #include <set>
 #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/weak_ptr.h"
 
 namespace iapps {
 
 // This class is the holder for iTunes parsed data. Given a path to the iTunes
 // 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.
 // It is not thread safe, but can be run on any thread with IO access.
 class IAppsDataProvider {
  public:
@@ skipping 42 matching lines @@
   scoped_ptr<base::FilePathWatcher> library_watcher_;
 
   base::WeakPtrFactory<IAppsDataProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IAppsDataProvider);
 };
 
 }  // namespace iapps
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_IAPPS_DATA_PROVIDER_H_