summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-17 21:35:27 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-17 21:35:27 +0000
commit31d5661563a8dafc0409cf677a4e149c08ddb770 (patch)
tree602724525407700923eaca5e3f9b9e01bff5c016 /chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
parent3acc642339a305cb5fd1f3f3b485c3df2bfd4155 (diff)
downloadchromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.zip
chromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.tar.gz
chromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.tar.bz2
Standardize StringToInt{,64} interface.
These changes address issue #106655. All variants of StringToInt have been converted to use the StringPiece class. One instance of conversion, in chrome/browser/history/text_database.cc, required copying an underlying string. This is because the string type in question could use 8 or 16 bit characters depending on the OS type, and because StringPiece is not implemented as a template, the code cannot specify whether to create a StringPiece or StringPiece16. This should be remedied in a future CL. R=erikwright@chromium.org BUG=106655 TEST= Review URL: http://codereview.chromium.org/8921006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_blocking_page.cc')
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 976c414..05dfb39 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -12,6 +12,7 @@
#include "base/i18n/rtl.h"
#include "base/lazy_instance.h"
#include "base/string_number_conversions.h"
+#include "base/string_piece.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
@@ -467,8 +468,9 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) {
size_t colon_index = command.find(':');
if (colon_index != std::string::npos) {
DCHECK(colon_index < command.size() - 1);
- bool result = base::StringToInt(command.begin() + colon_index + 1,
- command.end(),
+ bool result = base::StringToInt(base::StringPiece(command.begin() +
+ colon_index + 1,
+ command.end()),
&element_index);
command = command.substr(0, colon_index);
DCHECK(result);