Update monet.

net/tools/dump_cache/url_to_filename_encoder_unittest.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/tools/dump_cache/url_to_filename_encoder.h"
 
 #include <string>
 #include <vector>
 
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace net {
 
 #ifdef WIN32
 char kDirSeparator = '\\';
 char kOtherDirSeparator = '/';
 #else
 char kDirSeparator = '/';
 char kOtherDirSeparator = '\\';
 #endif
 
 class UrlToFilenameEncoderTest : public ::testing::Test {
  protected:
   UrlToFilenameEncoderTest() : escape_(1, UrlToFilenameEncoder::kEscapeChar),
                                dir_sep_(1, kDirSeparator) {
   }
 
   void CheckSegmentLength(const StringPiece& escaped_word) {
-    std::vector<StringPiece> components;
-    Tokenize(escaped_word, StringPiece("/"), &components);
-    for (size_t i = 0; i < components.size(); ++i) {
+    for (const base::StringPiece& component :
+         base::SplitStringPiece(escaped_word, "/", base::KEEP_WHITESPACE,
+                                base::SPLIT_WANT_NONEMPTY)) {
       EXPECT_GE(UrlToFilenameEncoder::kMaximumSubdirectoryLength,
-                components[i].size());
+                component.size());
     }
   }
 
   void CheckValidChars(const StringPiece& escaped_word, char invalid_slash) {
     // These characters are invalid in Windows.  We add in ', as that's pretty
     // inconvenient in a Unix filename.
     //
     // See http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx
     const string kInvalidChars = "<>:\"|?*'";
     for (size_t i = 0; i < escaped_word.size(); ++i) {
@@ skipping 286 matching lines @@
   EXPECT_EQ(long_word.size() + 4, escaped_word.size());
   ASSERT_LT(UrlToFilenameEncoder::kMaximumSubdirectoryLength,
             escaped_word.size());
   // Check that the backslash got inserted at the correct spot.
   EXPECT_EQ('\\', escaped_word[
       UrlToFilenameEncoder::kMaximumSubdirectoryLength]);
 }
 
 }  // namespace net