EDK: Add functions for converting between strings and numbers.

mojo/edk/embedder/platform_channel_pair.cc

 // 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.
 
 #include "mojo/edk/embedder/platform_channel_pair.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
-#include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "mojo/edk/platform/platform_handle.h"
+#include "mojo/edk/util/string_number_conversions.h"
 
 using mojo::platform::PlatformHandle;
 using mojo::platform::ScopedPlatformHandle;
+using mojo::util::NumberToString;
+using mojo::util::StringToNumberWithError;
 
 namespace mojo {
 namespace embedder {
 
 namespace {
 
 bool IsTargetDescriptorUsed(
     const base::FileHandleMappingVector& file_handle_mapping,
     int target_fd) {
   for (size_t i = 0; i < file_handle_mapping.size(); i++) {
@@ skipping 41 matching lines @@
 }
 
 ScopedPlatformHandle PlatformChannelPair::PassClientHandle() {
   return client_handle_.Pass();
 }
 
 // static
 ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
     const std::string& string_from_parent) {
   int client_fd = -1;
-  if (!base::StringToInt(string_from_parent, &client_fd)) {
+  if (!StringToNumberWithError<int>(string_from_parent, &client_fd)) {
     LOG(ERROR) << "Missing or invalid --" << kMojoPlatformChannelHandleSwitch;
     return ScopedPlatformHandle();
   }
 
   return ScopedPlatformHandle(PlatformHandle(client_fd));
 }
 
 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
     std::string* string_for_child,
     HandlePassingInformation* handle_passing_info) const {
   DCHECK(string_for_child);
   DCHECK(handle_passing_info);
   // This is an arbitrary sanity check. (Note that this guarantees that the loop
   // below will terminate sanely.)
   CHECK_LT(handle_passing_info->size(), 1000u);
 
   DCHECK(client_handle_.is_valid());
 
   // Find a suitable FD to map our client handle to in the child process.
   // This has quadratic time complexity in the size of |*handle_passing_info|,
   // but |*handle_passing_info| should be very small (usually/often empty).
   int target_fd = base::GlobalDescriptors::kBaseDescriptor;
   while (IsTargetDescriptorUsed(*handle_passing_info, target_fd))
     target_fd++;
 
   handle_passing_info->push_back(
       std::pair<int, int>(client_handle_.get().fd, target_fd));
-  *string_for_child = base::IntToString(target_fd);
+  *string_for_child = NumberToString<int>(target_fd);
 }
 
 void PlatformChannelPair::ChildProcessLaunched() {
   DCHECK(client_handle_.is_valid());
   client_handle_.reset();
 }
 
 }  // namespace embedder
 }  // namespace mojo