New new versions of Starts/EndsWith and SplitString in net

net/cookies/cookie_monster_unittest.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/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 418 matching lines @@
                               const std::string& coded_priority_str,
                               size_t expected_low_count,
                               size_t expected_medium_count,
                               size_t expected_high_count) {
     DeleteAll(cm);
     int next_cookie_id = 0;
     std::vector<CookiePriority> priority_list;
     std::vector<int> id_list[3];  // Indexed by CookiePriority.
 
     // Parse |coded_priority_str| and add cookies.
-    std::vector<std::string> priority_tok_list;
-    base::SplitString(coded_priority_str, ' ', &priority_tok_list);
-    for (std::vector<std::string>::iterator it = priority_tok_list.begin();
-         it != priority_tok_list.end(); ++it) {
-      size_t len = it->length();
-      DCHECK_NE(len, 0U);
+    for (const std::string& token :
+         base::SplitString(coded_priority_str, " ", base::TRIM_WHITESPACE,
+                           base::SPLIT_WANT_ALL)) {

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

nit: While you're here, this (and 467) are safe to clean up. I'm OK if you
don't, but worth calling it out since I'm sure I'll forget once this CL lands :)

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

I have no idea what you're asking me to clean up here. I'm happy to do any
updates in a second patch.

[Ryan Sleevi, 2015/07/06 16:58:12]

Sorry, meant

const base::StringPiece& token : base::SplitStringPiece(...)

Instead of copying the string.

+      DCHECK(!token.empty());
       // Take last character as priority.
-      CookiePriority priority = CharToPriority((*it)[len - 1]);
+      CookiePriority priority = CharToPriority(token[token.length() - 1]);
       std::string priority_str = CookiePriorityToString(priority);
       // The rest of the string (possibly empty) specifies repetition.
       int rep = 1;
-      if (!it->empty()) {
+      if (!token.empty()) {
         bool result = base::StringToInt(
-            base::StringPiece(it->begin(), it->end() - 1), &rep);
+            base::StringPiece(token.begin(), token.end() - 1), &rep);
         DCHECK(result);
       }
       for (; rep > 0; --rep, ++next_cookie_id) {
         std::string cookie = base::StringPrintf(
             "a%d=b;priority=%s", next_cookie_id, priority_str.c_str());
         EXPECT_TRUE(SetCookie(cm, url_google_, cookie));
         priority_list.push_back(priority);
         id_list[priority].push_back(next_cookie_id);
       }
     }
 
     int num_cookies = static_cast<int>(priority_list.size());
     std::vector<int> surviving_id_list[3];  // Indexed by CookiePriority.
 
     // Parse the list of cookies
     std::string cookie_str = this->GetCookies(cm, url_google_);
-    std::vector<std::string> cookie_tok_list;
-    base::SplitString(cookie_str, ';', &cookie_tok_list);
-    for (std::vector<std::string>::iterator it = cookie_tok_list.begin();
-         it != cookie_tok_list.end(); ++it) {
+    for (const std::string& token : base::SplitString(
+             cookie_str, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
       // Assuming *it is "a#=b", so extract and parse "#" portion.
       int id = -1;
       bool result = base::StringToInt(
-          base::StringPiece(it->begin() + 1, it->end() - 2), &id);
+          base::StringPiece(token.begin() + 1, token.end() - 2), &id);
       DCHECK(result);
       DCHECK_GE(id, 0);
       DCHECK_LT(id, num_cookies);
       surviving_id_list[priority_list[id]].push_back(id);
     }
 
     // Validate each priority.
     size_t expected_count[3] = {
         expected_low_count, expected_medium_count, expected_high_count};
     for (int i = 0; i < 3; ++i) {
@@ skipping 2478 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net