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

base/string_split_unittest.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/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::ElementsAre;
@@ skipping 144 matching lines @@
   SplitStringUsingSubstr("", "DELIMITER", &results);
   ASSERT_EQ(1u, results.size());
   EXPECT_THAT(results, ElementsAre(""));
 }
 
 // Test for SplitString
 TEST(StringUtilTest, SplitString) {
   std::vector<std::wstring> r;
 
   SplitString(L"", L',', &r);
-  EXPECT_EQ(0U, r.size());
+  ASSERT_EQ(1U, r.size());
+  EXPECT_EQ(r[0], L"");
   r.clear();
 
   SplitString(L"a,b,c", L',', &r);
   ASSERT_EQ(3U, r.size());
   EXPECT_EQ(r[0], L"a");
   EXPECT_EQ(r[1], L"b");
   EXPECT_EQ(r[2], L"c");
   r.clear();
 
   SplitString(L"a, b, c", L',', &r);
   ASSERT_EQ(3U, r.size());
   EXPECT_EQ(r[0], L"a");
   EXPECT_EQ(r[1], L"b");
   EXPECT_EQ(r[2], L"c");
   r.clear();
 
   SplitString(L"a,,c", L',', &r);
   ASSERT_EQ(3U, r.size());
   EXPECT_EQ(r[0], L"a");
   EXPECT_EQ(r[1], L"");
   EXPECT_EQ(r[2], L"c");
   r.clear();
 
-  SplitString(L"   ", L'*', &r);
-  EXPECT_EQ(0U, r.size());
+  SplitString(L"", L'*', &r);
+  ASSERT_EQ(1U, r.size());
+  EXPECT_EQ(r[0], L"");
   r.clear();
 
   SplitString(L"foo", L'*', &r);
   ASSERT_EQ(1U, r.size());
   EXPECT_EQ(r[0], L"foo");
   r.clear();
 
   SplitString(L"foo ,", L',', &r);
   ASSERT_EQ(2U, r.size());
   EXPECT_EQ(r[0], L"foo");
@@ skipping 55 matching lines @@
       "DELIMITER",
       &results);
   ASSERT_EQ(7u, results.size());
   EXPECT_THAT(
       results, ElementsAre("un", "deux", "trois", "quatre", "", "", ""));
 }
 
 TEST(StringSplitTest, StringSplitDontTrim) {
   std::vector<std::string> r;
 
-  SplitStringDontTrim("   ", '*', &r);
-  ASSERT_EQ(1U, r.size());
-  EXPECT_EQ(r[0], "   ");
-  r.clear();
-
-  SplitStringDontTrim("\t  \ta\t ", '\t', &r);
+  SplitStringDontTrim("\t\ta\t", '\t', &r);
   ASSERT_EQ(4U, r.size());
   EXPECT_EQ(r[0], "");
-  EXPECT_EQ(r[1], "  ");
+  EXPECT_EQ(r[1], "");
   EXPECT_EQ(r[2], "a");
-  EXPECT_EQ(r[3], " ");
+  EXPECT_EQ(r[3], "");
   r.clear();
 
   SplitStringDontTrim("\ta\t\nb\tcc", '\n', &r);
   ASSERT_EQ(2U, r.size());
   EXPECT_EQ(r[0], "\ta\t");
   EXPECT_EQ(r[1], "b\tcc");
   r.clear();
 }
 
 TEST(StringSplitTest, SplitStringAlongWhitespace) {
@@ skipping 22 matching lines @@
     SplitStringAlongWhitespace(data[i].input, &results);
     ASSERT_EQ(data[i].expected_result_count, results.size());
     if (data[i].expected_result_count > 0)
       ASSERT_EQ(data[i].output1, results[0]);
     if (data[i].expected_result_count > 1)
       ASSERT_EQ(data[i].output2, results[1]);
   }
 }
 
 }  // namespace base