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

Inspired by r111713.

BUG=none
TEST=none

R=gbillock@chromium.org

Review URL: http://codereview.chromium.org/8687002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111768 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 12 deletions

diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc
index a7f4df9..9198ea4 100644
--- a/base/i18n/string_search_unittest.cc
+++ b/base/i18n/string_search_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/i18n/rtl.h"
 #include "base/i18n/string_search.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "unicode/usearch.h"
@@ -35,10 +36,10 @@ TEST(StringSearchTest, ASCII) {
       ASCIIToUTF16("aabaaa"), ASCIIToUTF16("aaabaabaaa")));
 
   EXPECT_FALSE(StringSearchIgnoringCaseAndAccents(
-      ASCIIToUTF16("searching within empty string"), ASCIIToUTF16("")));
+      ASCIIToUTF16("searching within empty string"), string16()));
 
   EXPECT_TRUE(StringSearchIgnoringCaseAndAccents(
-      ASCIIToUTF16(""), ASCIIToUTF16("searching for empty string")));
+      string16(), ASCIIToUTF16("searching for empty string")));
 
   EXPECT_TRUE(StringSearchIgnoringCaseAndAccents(
       ASCIIToUTF16("case insensitivity"), ASCIIToUTF16("CaSe InSeNsItIvItY")));
diff --git a/base/string_piece_unittest.cc b/base/string_piece_unittest.cc
index 5339c09..694c43b 100644
--- a/base/string_piece_unittest.cc
+++ b/base/string_piece_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -542,15 +543,15 @@ TEST(StringPieceTest, HeterogenousStringPieceEquals) {
 }
 
 TEST(StringPiece16Test, CheckComparisonOperators) {
-  ASSERT_TRUE(StringPiece16(ASCIIToUTF16("")) ==
-              StringPiece16(ASCIIToUTF16("")));
+  ASSERT_TRUE(StringPiece16(string16()) ==
+              StringPiece16(string16()));
   ASSERT_TRUE(StringPiece16(ASCIIToUTF16("a")) ==
               StringPiece16(ASCIIToUTF16("a")));
   ASSERT_TRUE(StringPiece16(ASCIIToUTF16("aa")) ==
               StringPiece16(ASCIIToUTF16("aa")));
   ASSERT_FALSE(StringPiece16(ASCIIToUTF16("a")) ==
-               StringPiece16(ASCIIToUTF16("")));
-  ASSERT_FALSE(StringPiece16(ASCIIToUTF16("")) ==
+               StringPiece16(string16()));
+  ASSERT_FALSE(StringPiece16(string16()) ==
                StringPiece16(ASCIIToUTF16("a")));
   ASSERT_FALSE(StringPiece16(ASCIIToUTF16("a")) ==
                StringPiece16(ASCIIToUTF16("b")));
@@ -559,15 +560,15 @@ TEST(StringPiece16Test, CheckComparisonOperators) {
   ASSERT_FALSE(StringPiece16(ASCIIToUTF16("aa")) ==
                StringPiece16(ASCIIToUTF16("a")));
 
-  ASSERT_FALSE(StringPiece16(ASCIIToUTF16("")) !=
-               StringPiece16(ASCIIToUTF16("")));
+  ASSERT_FALSE(StringPiece16(string16()) !=
+               StringPiece16(string16()));
   ASSERT_FALSE(StringPiece16(ASCIIToUTF16("a")) !=
                StringPiece16(ASCIIToUTF16("a")));
   ASSERT_FALSE(StringPiece16(ASCIIToUTF16("aa")) !=
                StringPiece16(ASCIIToUTF16("aa")));
   ASSERT_TRUE(StringPiece16(ASCIIToUTF16("a")) !=
-              StringPiece16(ASCIIToUTF16("")));
-  ASSERT_TRUE(StringPiece16(ASCIIToUTF16("")) !=
+              StringPiece16(string16()));
+  ASSERT_TRUE(StringPiece16(string16()) !=
               StringPiece16(ASCIIToUTF16("a")));
   ASSERT_TRUE(StringPiece16(ASCIIToUTF16("a")) !=
               StringPiece16(ASCIIToUTF16("b")));
diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc
index ecdb84f..1ffc59b 100644
--- a/base/string_util_unittest.cc
+++ b/base/string_util_unittest.cc
@@ -9,6 +9,7 @@
 #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"
@@ -242,7 +243,7 @@ TEST(StringUtilTest, TrimWhitespace) {
   // 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) {
@@ -327,7 +328,7 @@ TEST(StringUtilTest, ContainsOnlyWhitespaceASCII) {
 }
 
 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  ")));