Issue 71980: Extensions code should use UTF-16 for user-visible Unicode strings

chrome/common/extensions/manifest_unittest.cc

Index: chrome/common/extensions/manifest_unittest.cc
===================================================================
--- chrome/common/extensions/manifest_unittest.cc	(revision 114019)
+++ chrome/common/extensions/manifest_unittest.cc	(working copy)
@@ -144,10 +144,11 @@
     // fail validation and are filtered out.
     DictionaryValue* value = manifest->value();
     for (size_t i = 0; i < restricted_keys_length; ++i) {
-      std::string error, str;
+      std::string str;
+      string16 error;
       value->Set(restricted_keys[i], Value::CreateStringValue(default_value_));
       EXPECT_FALSE(manifest->ValidateManifest(&error));
-      EXPECT_EQ(error, ExtensionErrorUtils::FormatErrorMessage(
+      EXPECT_EQ(error, ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kFeatureNotAllowed, restricted_keys[i]));
       EXPECT_FALSE(manifest->GetString(restricted_keys[i], &str));
       EXPECT_TRUE(value->Remove(restricted_keys[i], NULL));
@@ -171,9 +172,9 @@
     value->Set(*i, Value::CreateStringValue(default_value_));
 
   scoped_ptr<Manifest> manifest(new Manifest(value));
-  std::string error;
+  string16 error;
   EXPECT_TRUE(manifest->ValidateManifest(&error));
-  EXPECT_EQ("", error);
+  EXPECT_EQ(ASCIIToUTF16(""), error);
   AssertType(manifest.get(), Manifest::kTypeExtension);
 
   // Verify that all the extension keys are accessible.
@@ -206,9 +207,9 @@
   value->Set(theme_key, Value::CreateStringValue(default_value_));
 
   scoped_ptr<Manifest> manifest(new Manifest(value));
-  std::string error;
+  string16 error;
   EXPECT_TRUE(manifest->ValidateManifest(&error));
-  EXPECT_EQ("", error);
+  EXPECT_EQ(ASCIIToUTF16(""), error);
   AssertType(manifest.get(), Manifest::kTypeTheme);
 
   // Verify that all the theme keys are accessible.
@@ -240,9 +241,9 @@
   value->Set(keys::kPlatformApp, Value::CreateBooleanValue(true));
 
   scoped_ptr<Manifest> manifest(new Manifest(value));
-  std::string error;
+  string16 error;
   EXPECT_TRUE(manifest->ValidateManifest(&error));
-  EXPECT_EQ("", error);
+  EXPECT_EQ(ASCIIToUTF16(""), error);
   AssertType(manifest.get(), Manifest::kTypePlatformApp);
 
   // Verify that all the platform app keys are accessible.
@@ -275,9 +276,9 @@
   value->Set(keys::kWebURLs, Value::CreateStringValue(default_value_));
 
   scoped_ptr<Manifest> manifest(new Manifest(value));
-  std::string error;
+  string16 error;
   EXPECT_TRUE(manifest->ValidateManifest(&error));
-  EXPECT_EQ("", error);
+  EXPECT_EQ(ASCIIToUTF16(""), error);
   AssertType(manifest.get(), Manifest::kTypeHostedApp);
 
   // Verify that all the hosted app keys are accessible.
@@ -308,9 +309,9 @@
   value->Set(keys::kApp, Value::CreateStringValue(default_value_));
 
   scoped_ptr<Manifest> manifest(new Manifest(value));
-  std::string error;
+  string16 error;
   EXPECT_TRUE(manifest->ValidateManifest(&error));
-  EXPECT_EQ("", error);
+  EXPECT_EQ(ASCIIToUTF16(""), error);
   AssertType(manifest.get(), Manifest::kTypePackagedApp);
 
   // Verify that all the packaged app keys are accessible.