Standardize StringToInt{,64} interface.

chrome/browser/chromeos/login/default_user_images.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 "chrome/browser/chromeos/login/default_user_images.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 23 matching lines @@
 // the default images indices. Returns the index of the image in |image_id|
 // variable.
 bool IsDefaultImageString(const std::string& s,
                           const std::string& prefix,
                           int* image_id) {
   DCHECK(image_id);
   if (!StartsWithASCII(s, prefix, true))
     return false;
 
   int image_index = -1;
-  if (base::StringToInt(s.begin() + prefix.length(),
-                        s.end(),
+  if (base::StringToInt(base::StringPiece(s.begin() + prefix.length(),
+                                          s.end()),
                         &image_index)) {
     if (image_index < 0 || image_index >= kDefaultImagesCount)
       return false;
     *image_id = image_index;
     return true;
   }
 
   return false;
 }
 }  // namespace
@@ skipping 63 matching lines @@
 
 // The order and the values of these constants are important for histograms
 // of different Chrome OS versions to be merged smoothly.
 const int kHistogramImageFromCamera = kDefaultImagesCount;
 const int kHistogramImageFromFile = kDefaultImagesCount + 1;
 const int kHistogramImageOld = kDefaultImagesCount + 2;
 const int kHistogramImageFromProfile = kDefaultImagesCount + 3;
 const int kHistogramImagesCount = kDefaultImagesCount + 4;
 
 }  // namespace chromeos