New new versions of Starts/EndsWith and SplitString in net

net/tools/balsa/balsa_frame.cc

 // Copyright 2013 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/balsa/balsa_frame.h"
 
 // Visual C++ defines _M_IX86_FP as 2 if the /arch:SSE2 compiler option is
 // specified.
 #if !defined(__SSE2__) && _M_IX86_FP == 2
 #define __SSE2__ 1
 #endif
 
 #include <assert.h>
 #if __SSE2__
 #include <emmintrin.h>
 #endif  // __SSE2__
 
 #include <limits>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "net/tools/balsa/balsa_enums.h"
 #include "net/tools/balsa/balsa_headers.h"
 #include "net/tools/balsa/balsa_visitor_interface.h"
 #include "net/tools/balsa/buffer_interface.h"
 #include "net/tools/balsa/simple_buffer.h"
 #include "net/tools/balsa/split.h"
 #include "net/tools/balsa/string_piece_utils.h"
 
 #if defined(COMPILER_MSVC)
 #include <intrin.h>
@@ skipping 682 matching lines @@
     } else {
       const char* start = p;
       while (++p != end && *p != delim) {
         // Skip to the next occurence of the delimiter.
       }
       *before = base::StringPiece(start, p - start);
       if (p != end)
         *after = base::StringPiece(p + 1, end - (p + 1));
       else
         *after = base::StringPiece("");
-      StringPieceUtils::RemoveWhitespaceContext(before);
-      StringPieceUtils::RemoveWhitespaceContext(after);
+      *before = base::TrimWhitespaceASCII(*before, base::TRIM_ALL);
+      *after = base::TrimWhitespaceASCII(*after, base::TRIM_ALL);
       return true;
     }
   }
 
   *before = original;
   *after = "";
   return false;
 }
 
 // TODO(phython): Fix this function to properly deal with quoted values.
 // E.g. ";;foo", "\";;\"", or \"aa;
 // The last example, the semi-colon is a separator between extensions.
 void ProcessChunkExtensionsManual(base::StringPiece all_extensions,
                                   BalsaHeaders* extensions) {
   base::StringPiece extension;
   base::StringPiece remaining;
-  StringPieceUtils::RemoveWhitespaceContext(&all_extensions);
+  all_extensions = base::TrimWhitespaceASCII(all_extensions, base::TRIM_ALL);
   SplitStringPiece(all_extensions, ';', &extension, &remaining);
   while (!extension.empty()) {
     base::StringPiece key;
     base::StringPiece value;
     SplitStringPiece(extension, '=', &key, &value);
     if (!value.empty()) {
       // Strip quotation marks if they exist.
       if (!value.empty() && value[0] == '"')
         value.remove_prefix(1);
       if (!value.empty() && value[value.length() - 1] == '"')
         value.remove_suffix(1);
     }
 
     extensions->AppendHeader(key, value);
 
-    StringPieceUtils::RemoveWhitespaceContext(&remaining);
+    remaining = base::TrimWhitespaceASCII(remaining, base::TRIM_ALL);
     SplitStringPiece(remaining, ';', &extension, &remaining);
   }
 }
 
 }  // anonymous namespace
 
 void BalsaFrame::ProcessChunkExtensions(const char* input, size_t size,
                                         BalsaHeaders* extensions) {
   ProcessChunkExtensionsManual(base::StringPiece(input, size), extensions);
 }
@@ skipping 794 matching lines @@
     << "$$$$$$$$$$$$$$$"
     << " consumed: " << (current - input);
   if (Error()) {
     LOG(INFO) << BalsaFrameEnums::ErrorCodeToString(ErrorCode());
   }
 #endif  // DEBUGFRAMER
   return current - input;
 }
 
 }  // namespace net