Update code that previously constructed strings from string iterators only to use StringToInt. These usages now pass the iterators directly to the new StringToInt overloads.

BUG=None
TEST=All
Review URL: http://codereview.chromium.org/3968001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63515 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 16 deletions

diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index 4839a91..99a9e4c 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -342,12 +342,6 @@ bool MultipartResponseDelegate::ReadContentRanges(
     return false;
   }
 
-  size_t byte_range_lower_bound_characters =
-      byte_range_lower_bound_end_offset - byte_range_lower_bound_start_offset;
-  std::string byte_range_lower_bound =
-      content_range.substr(byte_range_lower_bound_start_offset,
-                           byte_range_lower_bound_characters);
-
   size_t byte_range_upper_bound_start_offset =
       byte_range_lower_bound_end_offset + 1;
 
@@ -357,16 +351,16 @@ bool MultipartResponseDelegate::ReadContentRanges(
     return false;
   }
 
-  size_t byte_range_upper_bound_characters =
-      byte_range_upper_bound_end_offset - byte_range_upper_bound_start_offset;
-
-  std::string byte_range_upper_bound =
-      content_range.substr(byte_range_upper_bound_start_offset,
-                           byte_range_upper_bound_characters);
-
-  if (!base::StringToInt(byte_range_lower_bound, content_range_lower_bound))
+  if (!base::StringToInt(
+      content_range.begin() + byte_range_lower_bound_start_offset,
+      content_range.begin() + byte_range_lower_bound_end_offset,
+      content_range_lower_bound))
     return false;
-  if (!base::StringToInt(byte_range_upper_bound, content_range_upper_bound))
+
+  if (!base::StringToInt(
+      content_range.begin() + byte_range_upper_bound_start_offset,
+      content_range.begin() + byte_range_upper_bound_end_offset,
+      content_range_upper_bound))
     return false;
   return true;
 }
diff --git a/webkit/tools/test_shell/listener_leak_test.cc b/webkit/tools/test_shell/listener_leak_test.cc
index 6f2fc4d..ce8fe3f 100644
--- a/webkit/tools/test_shell/listener_leak_test.cc
+++ b/webkit/tools/test_shell/listener_leak_test.cc
@@ -44,7 +44,9 @@ static int GetNumObjects(int log_skip, const std::string& constructor) {
   size_t j = v8_log.find(",", i);
   CHECK(j != std::string::npos);
   int num_objects;
-  CHECK(base::StringToInt(v8_log.substr(i, j - i), &num_objects));
+  CHECK(base::StringToInt(v8_log.begin() + i,
+                          v8_log.begin() + j,
+                          &num_objects));
   return num_objects;
 }