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

See chromium-dev thread for reference:
https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/ec912e667c6fdec8#

This patch fixes almost all the entries, remaining only one entry in webkit/
directory that will be sent for review separately.

R=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10356025

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

4 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index f44a547..1ab3a9b 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -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;
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index a80f46d..0404eb4 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -183,7 +183,7 @@ void WebIntentPickerController::ShowDialog(const string16& action,
   if (wrapper_->profile()->IsOffTheRecord()) {
     if (intents_dispatcher_) {
       intents_dispatcher_->SendReplyMessage(
-          webkit_glue::WEB_INTENT_REPLY_FAILURE, ASCIIToUTF16(""));
+          webkit_glue::WEB_INTENT_REPLY_FAILURE, string16());
     }
     return;
   }
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index 2a3c2d4..8f443ac 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -20,10 +20,10 @@ class MockTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate {
       : TabModalConfirmDialogDelegate(web_contents) {}
 
   virtual string16 GetTitle() OVERRIDE {
-    return ASCIIToUTF16("");
+    return string16();
   }
   virtual string16 GetMessage() OVERRIDE {
-    return ASCIIToUTF16("");
+    return string16();
   }
 
   MOCK_METHOD0(OnAccepted, void());
diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc
index bffa527..ca75eaa 100644
--- a/chrome/renderer/spellchecker/spellcheck_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc
@@ -847,8 +847,7 @@ TEST_F(SpellCheckTest, SpellCheckParagraphLongSentenceMultipleMisspellings) {
 TEST_F(SpellCheckTest, RequestSpellCheckWithEmptyString) {
   MockTextCheckingCompletion completion;
 
-  const string16 text = ASCIIToUTF16("");
-  spell_check()->RequestTextChecking(text, 0, &completion);
+  spell_check()->RequestTextChecking(string16(), 0, &completion);
 
   MessageLoop::current()->RunAllPending();