wstring: remove wstring version of SplitString

base/string_split_unittest.cc

-// Copyright (c) 2010 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;
 
 namespace base {
 
+namespace {

[Evan Martin, 2011/05/05 20:52:24]

Not sure about this; I think the test had the above namespace so it didn't need
to qualify everything.  It might make sense to do "using namespace base" and
then remove the above namespace block.

[brettw, 2011/05/05 21:09:41]

I normally put the tests in the base namespace since the're in the same
directory and conceptually belong to the same module.

+
+#if !defined(WCHAR_T_IS_UTF16)
+// Overload SplitString with a wide-char version to make it easier to
+// test the string16 version with wide character literals.
+void SplitString(const std::wstring& str,
+                 wchar_t c,
+                 std::vector<std::wstring>* result) {
+  std::vector<string16> result16;
+  SplitString(WideToUTF16(str), c, &result16);
+  for (size_t i = 0; i < result16.size(); ++i)
+    result->push_back(UTF16ToWide(result16[i]));
+}
+#endif
+
 class SplitStringIntoKeyValuesTest : public testing::Test {
  protected:
   std::string key;
   std::vector<std::string> values;
 };
 
 TEST_F(SplitStringIntoKeyValuesTest, EmptyInputMultipleValues) {
   EXPECT_FALSE(SplitStringIntoKeyValues("",     // Empty input
                                         '\t',   // Key separators
                                         &key, &values));
@@ skipping 264 matching lines @@
     std::vector<std::wstring> results;
     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
+
 }  // namespace base