Revert of Move JoinString to the base namespace

base/strings/string_util_unittest.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 "base/strings/string_util.h"
 
 #include <math.h>
 #include <stdarg.h>
 
 #include <algorithm>
@@ skipping 651 matching lines @@
 
   // Verify the lower case as well.
   EXPECT_EQ(10, HexDigitToInt('a'));
   EXPECT_EQ(11, HexDigitToInt('b'));
   EXPECT_EQ(12, HexDigitToInt('c'));
   EXPECT_EQ(13, HexDigitToInt('d'));
   EXPECT_EQ(14, HexDigitToInt('e'));
   EXPECT_EQ(15, HexDigitToInt('f'));
 }
 
+// Test for JoinString
 TEST(StringUtilTest, JoinString) {
+  std::vector<std::string> in;
+  EXPECT_EQ("", JoinString(in, ','));
+
+  in.push_back("a");
+  EXPECT_EQ("a", JoinString(in, ','));
+
+  in.push_back("b");
+  in.push_back("c");
+  EXPECT_EQ("a,b,c", JoinString(in, ','));
+
+  in.push_back(std::string());
+  EXPECT_EQ("a,b,c,", JoinString(in, ','));
+  in.push_back(" ");
+  EXPECT_EQ("a|b|c|| ", JoinString(in, '|'));
+}
+
+// Test for JoinString overloaded with std::string separator
+TEST(StringUtilTest, JoinStringWithString) {
   std::string separator(", ");
   std::vector<std::string> parts;
   EXPECT_EQ(std::string(), JoinString(parts, separator));
 
   parts.push_back("a");
   EXPECT_EQ("a", JoinString(parts, separator));
 
   parts.push_back("b");
   parts.push_back("c");
   EXPECT_EQ("a, b, c", JoinString(parts, separator));
 
   parts.push_back(std::string());
   EXPECT_EQ("a, b, c, ", JoinString(parts, separator));
   parts.push_back(" ");
   EXPECT_EQ("a|b|c|| ", JoinString(parts, "|"));
 }
 
-TEST(StringUtilTest, JoinString16) {
+// Test for JoinString overloaded with string16 separator
+TEST(StringUtilTest, JoinStringWithString16) {
   string16 separator = ASCIIToUTF16(", ");
   std::vector<string16> parts;
   EXPECT_EQ(string16(), JoinString(parts, separator));
 
   parts.push_back(ASCIIToUTF16("a"));
   EXPECT_EQ(ASCIIToUTF16("a"), JoinString(parts, separator));
 
   parts.push_back(ASCIIToUTF16("b"));
   parts.push_back(ASCIIToUTF16("c"));
   EXPECT_EQ(ASCIIToUTF16("a, b, c"), JoinString(parts, separator));
@@ skipping 384 matching lines @@
   const std::string live = kLive;
   std::string dead = live;
   strncpy(WriteInto(&dead, 5), kDead, 4);
   EXPECT_EQ(kDead, dead);
   EXPECT_EQ(4u, dead.size());
   EXPECT_EQ(kLive, live);
   EXPECT_EQ(4u, live.size());
 }
 
 }  // namespace base