| Index: chrome/browser/extensions/convert_user_script_unittest.cc
|
| diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
|
| index f44a547ee165371960cc20170b6d024af4ba18df..7746500e016eb0f2692825b09d3da99a68cefd3b 100644
|
| --- a/chrome/browser/extensions/convert_user_script_unittest.cc
|
| +++ b/chrome/browser/extensions/convert_user_script_unittest.cc
|
| @@ -36,7 +36,7 @@ TEST(ExtensionFromUserScript, Basic) {
|
| test_file, GURL("http://www.google.com/foo"), &error));
|
|
|
| ASSERT_TRUE(extension.get());
|
| - EXPECT_EQ(ASCIIToUTF16(""), error);
|
| + EXPECT_EQ(string16(), error);
|
|
|
| // Use a temp dir so that the extensions dir will clean itself up.
|
| ScopedTempDir ext_dir;
|
| @@ -82,7 +82,7 @@ TEST(ExtensionFromUserScript, NoMetdata) {
|
| test_file, GURL("http://www.google.com/foo/bar.user.js?monkey"), &error));
|
|
|
| ASSERT_TRUE(extension.get());
|
| - EXPECT_EQ(ASCIIToUTF16(""), error);
|
| + EXPECT_EQ(string16(), error);
|
|
|
| // Use a temp dir so that the extensions dir will clean itself up.
|
| ScopedTempDir ext_dir;
|
| @@ -139,7 +139,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentStart) {
|
| test_file, GURL("http://www.google.com/foo"), &error));
|
|
|
| ASSERT_TRUE(extension.get());
|
| - EXPECT_EQ(ASCIIToUTF16(""), error);
|
| + EXPECT_EQ(string16(), error);
|
|
|
| // Use a temp dir so that the extensions dir will clean itself up.
|
| ScopedTempDir ext_dir;
|
| @@ -168,7 +168,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentEnd) {
|
| test_file, GURL("http://www.google.com/foo"), &error));
|
|
|
| ASSERT_TRUE(extension.get());
|
| - EXPECT_EQ(ASCIIToUTF16(""), error);
|
| + EXPECT_EQ(string16(), error);
|
|
|
| // Use a temp dir so that the extensions dir will clean itself up.
|
| ScopedTempDir ext_dir;
|
| @@ -198,7 +198,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentIdle) {
|
| test_file, GURL("http://www.google.com/foo"), &error));
|
|
|
| ASSERT_TRUE(extension.get());
|
| - EXPECT_EQ(ASCIIToUTF16(""), error);
|
| + EXPECT_EQ(string16(), error);
|
|
|
| // Use a temp dir so that the extensions dir will clean itself up.
|
| ScopedTempDir ext_dir;
|
|
|