chrome: Instead of doing a conversion just use string16().

chrome/browser/extensions/convert_user_script_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 <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_basic.user.js");
 
   string16 error;
   scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
       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;
   EXPECT_TRUE(ext_dir.Set(extension->path()));
 
   // Validate generated extension metadata.
   EXPECT_EQ("My user script", extension->name());
   EXPECT_EQ("2.2.2", extension->VersionString());
   EXPECT_EQ("Does totally awesome stuff.", extension->description());
   EXPECT_EQ("IhCFCg9PMQTAcJdc9ytUP99WME+4yh6aMnM1uupkovo=",
@@ skipping 25 matching lines @@
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_no_metadata.user.js");
 
   string16 error;
   scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
       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;
   EXPECT_TRUE(ext_dir.Set(extension->path()));
 
   // Validate generated extension metadata.
   EXPECT_EQ("bar.user.js", extension->name());
   EXPECT_EQ("1.0", extension->VersionString());
   EXPECT_EQ("", extension->description());
   EXPECT_EQ("k1WxKx54hX6tfl5gQaXD/m4d9QUMwRdXWM4RW+QkWcY=",
@@ skipping 36 matching lines @@
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_run_at_start.user.js");
 
   string16 error;
   scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
       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;
   EXPECT_TRUE(ext_dir.Set(extension->path()));
 
   // Validate generated extension metadata.
   EXPECT_EQ("Document Start Test", extension->name());
   EXPECT_EQ("This script tests document-start", extension->description());
   EXPECT_EQ("RjmyI7+Gp/YHcW1qnu4xDxkJcL4cV4kTzdCA4BajCbk=",
             extension->public_key());
 
   // Validate run location.
   ASSERT_EQ(1u, extension->content_scripts().size());
   const UserScript& script = extension->content_scripts()[0];
   EXPECT_EQ(UserScript::DOCUMENT_START, script.run_location());
 }
 
 TEST(ExtensionFromUserScript, RunAtDocumentEnd) {
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_run_at_end.user.js");
 
   string16 error;
   scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
       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;
   EXPECT_TRUE(ext_dir.Set(extension->path()));
 
   // Validate generated extension metadata.
   EXPECT_EQ("Document End Test", extension->name());
   EXPECT_EQ("This script tests document-end", extension->description());
   EXPECT_EQ("cpr5i8Mi24FzECV8UJe6tanwlU8SWesZosJ915YISvQ=",
             extension->public_key());
 
   // Validate run location.
   ASSERT_EQ(1u, extension->content_scripts().size());
   const UserScript& script = extension->content_scripts()[0];
   EXPECT_EQ(UserScript::DOCUMENT_END, script.run_location());
 }
 
 TEST(ExtensionFromUserScript, RunAtDocumentIdle) {
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_run_at_idle.user.js");
   ASSERT_TRUE(file_util::PathExists(test_file)) << test_file.value();
 
   string16 error;
   scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
       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;
   EXPECT_TRUE(ext_dir.Set(extension->path()));
 
   // Validate generated extension metadata.
   EXPECT_EQ("Document Idle Test", extension->name());
   EXPECT_EQ("This script tests document-idle", extension->description());
   EXPECT_EQ("kHnHKec3O/RKKo5/Iu1hKqe4wQERthL0639isNtsfiY=",
             extension->public_key());
 
   // Validate run location.
   ASSERT_EQ(1u, extension->content_scripts().size());
   const UserScript& script = extension->content_scripts()[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }