Switch to standard integer types in courgette/.

courgette/ensemble.cc

 // Copyright (c) 2011 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.
 
 #include "courgette/ensemble.h"
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/strings/string_number_conversions.h"
 
 #include "courgette/region.h"
 #include "courgette/simple_delta.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 Element::Element(ExecutableType kind,
                  Ensemble* ensemble,
                  const Region& region)
     : kind_(kind), ensemble_(ensemble), region_(region) {
 }
 
 Element::~Element() {}
 
 std::string Element::Name() const {
   return ensemble_->name() + "("
       + base::IntToString(kind()) + ","
       + base::Uint64ToString(offset_in_ensemble()) + ","
       + base::Uint64ToString(region().length()) + ")";
 }
 
 // Scans the Ensemble's region, sniffing out Elements.  We assume that the
 // elements do not overlap.
 Status Ensemble::FindEmbeddedElements() {
 
   size_t length = region_.length();
-  const uint8* start = region_.start();
+  const uint8_t* start = region_.start();
 
   size_t position = 0;
   while (position < length) {
     ExecutableType type;
     size_t detected_length;
 
     Status result = DetectExecutableType(start + position,
                                          length - position,
                                          &type, &detected_length);
 
@@ skipping 10 matching lines @@
   }
   return C_OK;
 }
 
 Ensemble::~Ensemble() {
   for (size_t i = 0;  i < owned_elements_.size();  ++i)
     delete owned_elements_[i];
 }
 
 }  // namespace