New new versions of Starts/EndsWith and SplitString in net

net/dns/dns_config_service_win.cc

 // Copyright (c) 2012 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/dns/dns_config_service_win.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 116 matching lines @@
     rv = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, out.get(), &len);
   }
   if (rv != NO_ERROR)
     out.reset();
   return out.Pass();
 }
 
 // Converts a base::string16 domain name to ASCII, possibly using punycode.
 // Returns true if the conversion succeeds and output is not empty. In case of
 // failure, |domain| might become dirty.
-bool ParseDomainASCII(const base::string16& widestr, std::string* domain) {
+bool ParseDomainASCII(base::StringPiece16 widestr, std::string* domain) {
   DCHECK(domain);
   if (widestr.empty())
     return false;
 
   // Check if already ASCII.
   if (base::IsStringASCII(widestr)) {
-    *domain = base::UTF16ToASCII(widestr);
+    domain->assign(widestr.begin(), widestr.end());
     return true;
   }
 
   // Otherwise try to convert it from IDN to punycode.
   const int kInitialBufferSize = 256;
   url::RawCanonOutputT<base::char16, kInitialBufferSize> punycode;
   if (!url::IDNToASCII(widestr.data(), widestr.length(), &punycode))
     return false;
 
   // |punycode_output| should now be ASCII; convert it to a std::string.
@@ skipping 314 matching lines @@
   DCHECK(output);
   if (value.empty())
     return false;
 
   output->clear();
 
   // If the list includes an empty hostname (",," or ", ,"), it is terminated.
   // Although nslookup and network connection property tab ignore such
   // fragments ("a,b,,c" becomes ["a", "b", "c"]), our reference is getaddrinfo
   // (which sees ["a", "b"]). WMI queries also return a matching search list.
-  std::vector<base::string16> woutput;
-  base::SplitString(value, ',', &woutput);
-  for (size_t i = 0; i < woutput.size(); ++i) {
+  for (const base::StringPiece16& t : base::SplitStringPiece(
+           value, L",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {

[Ryan Sleevi, 2015/07/06 08:52:02]

CONSISTENCY PEDANTRY NIT: Elsewhere, you use base::ASCIIToUTF16(",") [and
friends]

Totally understand that because this is Windows, L"," will 'do the right thing',
but it was enough to make me look at this a little odd initially (until I
realized it was a _win file), so I thought I'd call it out, especially when
elsewhere in the CL it uses a different pattern.

Totally fine if you want ot leave it as is.

[brettw, 2015/07/06 16:52:34]

This is pretty common in Windows files, at least in the ones I see often. I'll
leave it.

     // Convert non-ASCII to punycode, although getaddrinfo does not properly
     // handle such suffixes.
-    const base::string16& t = woutput[i];
     std::string parsed;
     if (!ParseDomainASCII(t, &parsed))
       break;
     output->push_back(parsed);
   }
   return !output->empty();
 }
 
 ConfigParseWinResult ConvertSettingsToDnsConfig(
     const DnsSystemSettings& settings,
@@ skipping 284 matching lines @@
 }
 
 }  // namespace internal
 
 // static
 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() {
   return scoped_ptr<DnsConfigService>(new internal::DnsConfigServiceWin());
 }
 
 }  // namespace net