Move the number conversions from string_util to a new file....

courgette/ensemble.cc

 // Copyright (c) 2009 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.
 
-// *** File comments
-
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 
 #include "courgette/image_info.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
 #include "courgette/simple_delta.h"
 
 namespace courgette {
 
 Element::Element(Kind kind, Ensemble* ensemble, const Region& region)
     : kind_(kind), ensemble_(ensemble), region_(region) {
 }
 
 std::string Element::Name() const {
   return ensemble_->name() + "("
-      + IntToString(kind()) + ","
-      + Uint64ToString(offset_in_ensemble()) + ","
-      + Uint64ToString(region().length()) + ")";
+      + base::IntToString(kind()) + ","
+      + base::Uint64ToString(offset_in_ensemble()) + ","
+      + base::Uint64ToString(region().length()) + ")";
 }
 
 // A subclass of Element that has a PEInfo.
 class ElementWinPE : public Element {
  public:
   ElementWinPE(Kind kind, Ensemble* ensemble, const Region& region,
                PEInfo* info)
       : Element(kind, ensemble, region),
         pe_info_(info) {
   }
@@ skipping 57 matching lines @@
   }
   return C_OK;
 }
 
 Ensemble::~Ensemble() {
   for (size_t i = 0;  i < owned_elements_.size();  ++i)
     delete owned_elements_[i];
 }
 
 }  // namespace