Switch to standard integer types in courgette/.

courgette/third_party/paged_array.h

 // Copyright (c) 2010 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.
 
 // PagedArray implements an array stored using many fixed-size pages.
 //
 // PagedArray is a work-around to allow large arrays to be allocated when there
 // is too much address space fragmentation for allocating the large arrays as
 // contigous arrays.
 
 #ifndef COURGETTE_BSDIFF_PAGED_ARRAY_H_
 #define COURGETTE_BSDIFF_PAGED_ARRAY_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/process/memory.h"
 
 namespace courgette {
 
 // PagedArray implements an array stored using many fixed-size pages.
 template<typename T>
 class PagedArray {
   enum {
     // Page size in elements.  Page size of 2^18 * sizeof(T) is 1MB for T = int.
     kLogPageSize = 18,
@@ skipping 48 matching lines @@
   }
 
  private:
   T** pages_;
   size_t page_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PagedArray);
 };
 }  // namespace
 #endif  // COURGETTE_BSDIFF_PAGED_ARRAY_H_