Update code that previously constructed strings from string iterators only to...

net/proxy/proxy_bypass_rules.cc

 // Copyright (c) 2010 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 "net/proxy/proxy_bypass_rules.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
@@ skipping 246 matching lines @@
       GURL tmp_url("http://" + host);
       return AddRuleForHostname(scheme, tmp_url.host(), port);
     }
   }
 
   // Otherwise assume we have <hostname-pattern>[:port].
   std::string::size_type pos_colon = raw.rfind(':');
   host = raw;
   port = -1;
   if (pos_colon != std::string::npos) {
-    if (!base::StringToInt(raw.substr(pos_colon + 1), &port) ||
+    if (!base::StringToInt(raw.begin() + pos_colon + 1, raw.end(), &port) ||
         (port < 0 || port > 0xFFFF)) {
       return false;  // Port was invalid.
     }
     raw = raw.substr(0, pos_colon);
   }
 
   // Special-case hostnames that begin with a period.
   // For example, we remap ".google.com" --> "*.google.com".
   if (StartsWithASCII(raw, ".", false))
     raw = "*" + raw;
 
   // If suffix matching was asked for, make sure the pattern starts with a
   // wildcard.
   if (use_hostname_suffix_matching && !StartsWithASCII(raw, "*", false))
     raw = "*" + raw;
 
   return AddRuleForHostname(scheme, raw, port);
 }
 
 bool ProxyBypassRules::AddRuleFromStringInternalWithLogging(
     const std::string& raw,
     bool use_hostname_suffix_matching) {
   return AddRuleFromStringInternal(raw, use_hostname_suffix_matching);
 }
 
 }  // namespace net