Switch to standard integer types in content/browser/.

content/browser/geolocation/wifi_data_provider_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.
 
 // A wifi data provider provides wifi data from the device that is used by a
 // NetworkLocationProvider to obtain a position fix. We use a singleton
 // instance of the wifi data provider manager, which is used by multiple
 // NetworkLocationProvider objects.
 //
 // This file provides WifiDataProviderManager, which provides static methods to
 // access the singleton instance. The singleton instance uses a private
 // implementation of WifiDataProvider to abstract across platforms and also to
 // allow mock providers to be used for testing.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
 #define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
 
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "content/browser/geolocation/wifi_data.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class WifiDataProvider;
@@ skipping 56 matching lines @@
 
   // The internal implementation.
   scoped_refptr<WifiDataProvider> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_