Revert r12998 - it broke some media/mime-related layout tests.

base/string_split.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/string_split.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 template<typename STR>
 static void SplitStringT(const STR& str,
                          const typename STR::value_type s,
                          bool trim_whitespace,
                          std::vector<STR>* r) {
   size_t last = 0;
+  size_t i;
   size_t c = str.size();
-  for (size_t i = 0; i <= c; ++i) {
+  for (i = 0; i <= c; ++i) {
     if (i == c || str[i] == s) {
-      STR tmp(str, last, i - last);
-      if (trim_whitespace)
-        TrimWhitespace(tmp, TRIM_ALL, &tmp);
-      // Avoid converting an empty or all-whitespace source string into a vector
-      // of one empty string.
-      if (i != c || !r->empty() || !tmp.empty())
+      size_t len = i - last;
+      STR tmp = str.substr(last, len);
+      if (trim_whitespace) {
+        STR t_tmp;
+        TrimWhitespace(tmp, TRIM_ALL, &t_tmp);
+        r->push_back(t_tmp);
+      } else {
         r->push_back(tmp);
+      }
       last = i + 1;
     }
   }
 }
 
 void SplitString(const string16& str,
                  char16 c,
                  std::vector<string16>* r) {
   DCHECK(CBU16_IS_SINGLE(c));
   SplitStringT(str, c, true, r);
@@ skipping 167 matching lines @@
                                 std::vector<string16>* result) {
   SplitStringAlongWhitespaceT(str, result);
 }
 
 void SplitStringAlongWhitespace(const std::string& str,
                                 std::vector<std::string>* result) {
   SplitStringAlongWhitespaceT(str, result);
 }
 
 }  // namespace base