Cleanup: Convert ASCIIToUTF16("") to string16().

base/string_util_unittest.cc

 // 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 <math.h>
 #include <stdarg.h>
 
 #include <limits>
 #include <sstream>
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 #include "base/string_util.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 {
 
 static const struct trim_case {
@@ skipping 213 matching lines @@
   }
 
   // Test that TrimWhitespace() can take the same string for input and output
   output = ASCIIToUTF16("  This is a test \r\n");
   EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output));
   EXPECT_EQ(ASCIIToUTF16("This is a test"), output);
 
   // Once more, but with a string of whitespace
   output = ASCIIToUTF16("  \r\n");
   EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output));
-  EXPECT_EQ(ASCIIToUTF16(""), output);
+  EXPECT_EQ(string16(), output);
 
   std::string output_ascii;
   for (size_t i = 0; i < arraysize(trim_cases_ascii); ++i) {
     const trim_case_ascii& value = trim_cases_ascii[i];
     EXPECT_EQ(value.return_value,
               TrimWhitespace(value.input, value.positions, &output_ascii));
     EXPECT_EQ(value.output, output_ascii);
   }
 }
 
@@ skipping 64 matching lines @@
 TEST(StringUtilTest, ContainsOnlyWhitespaceASCII) {
   EXPECT_TRUE(ContainsOnlyWhitespaceASCII(""));
   EXPECT_TRUE(ContainsOnlyWhitespaceASCII(" "));
   EXPECT_TRUE(ContainsOnlyWhitespaceASCII("\t"));
   EXPECT_TRUE(ContainsOnlyWhitespaceASCII("\t \r \n  "));
   EXPECT_FALSE(ContainsOnlyWhitespaceASCII("a"));
   EXPECT_FALSE(ContainsOnlyWhitespaceASCII("\thello\r \n  "));
 }
 
 TEST(StringUtilTest, ContainsOnlyWhitespace) {
-  EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("")));
+  EXPECT_TRUE(ContainsOnlyWhitespace(string16()));
   EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16(" ")));
   EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("\t")));
   EXPECT_TRUE(ContainsOnlyWhitespace(ASCIIToUTF16("\t \r \n  ")));
   EXPECT_FALSE(ContainsOnlyWhitespace(ASCIIToUTF16("a")));
   EXPECT_FALSE(ContainsOnlyWhitespace(ASCIIToUTF16("\thello\r \n  ")));
 }
 
 TEST(StringUtilTest, IsStringUTF8) {
   EXPECT_TRUE(IsStringUTF8("abc"));
   EXPECT_TRUE(IsStringUTF8("\xc2\x81"));
@@ skipping 807 matching lines @@
   const std::string live = kLive;
   std::string dead = live;
   strncpy(WriteInto(&dead, 5), kDead, 4);
   EXPECT_STREQ(kDead, dead.c_str());
   EXPECT_EQ(4u, dead.size());
   EXPECT_STREQ(kLive, live.c_str());
   EXPECT_EQ(4u, live.size());
 }
 
 }  // namespace base