Revert dsh's change 10818

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

2 files changed, 26 insertions, 39 deletions

diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 966b514..c98975d 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -44,29 +44,23 @@ std::string SSLBlockingPage::GetHTMLContents() {
   // Let's build the html error page.
   DictionaryValue strings;
   SSLErrorInfo error_info = delegate_->GetSSLErrorInfo(error_);
-  strings.SetString(
-      LIT16("title"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_TITLE)));
-  strings.SetString(LIT16("headLine"), WideToUTF16Hack(error_info.title()));
-  strings.SetString(LIT16("description"),
-                    WideToUTF16Hack(error_info.details()));
-
-  strings.SetString(
-      LIT16("moreInfoTitle"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE)));
+  strings.SetString(L"title",
+                    l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_TITLE));
+  strings.SetString(L"headLine", error_info.title());
+  strings.SetString(L"description", error_info.details());
+
+  strings.SetString(L"moreInfoTitle",
+                    l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
   SetExtraInfo(&strings, error_info.extra_information());
 
-  strings.SetString(
-      LIT16("proceed"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_PROCEED)));
-  strings.SetString(
-      LIT16("exit"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_EXIT)));
+  strings.SetString(L"proceed",
+                    l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_PROCEED));
+  strings.SetString(L"exit",
+                    l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_EXIT));
 
-  strings.SetString(
-      LIT16("textdirection"),
+  strings.SetString(L"textdirection",
       (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
-      LIT16("rtl") : LIT16("ltr"));
+       L"rtl" : L"ltr");
 
   static const StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
@@ -137,15 +131,15 @@ void SSLBlockingPage::SetExtraInfo(
     DictionaryValue* strings,
     const std::vector<std::wstring>& extra_info) {
   DCHECK(extra_info.size() < 5);  // We allow 5 paragraphs max.
-  const string16 keys[5] = {
-    LIT16("moreInfo1"), LIT16("moreInfo2"), LIT16("moreInfo3"),
-    LIT16("moreInfo4"), LIT16("moreInfo5")
+  const std::wstring keys[5] = {
+      L"moreInfo1", L"moreInfo2", L"moreInfo3", L"moreInfo4", L"moreInfo5"
   };
   int i;
   for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
-    strings->SetString(keys[i], WideToUTF16Hack(extra_info[i]));
+    strings->SetString(keys[i], extra_info[i]);
   }
   for (;i < 5; i++) {
-    strings->SetString(keys[i], LIT16(""));
+    strings->SetString(keys[i], L"");
   }
 }
+
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index 7b18048..4a0fdef 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -76,25 +76,18 @@ static void ShowErrorPage(SSLPolicy* policy, SSLManager::CertError* error) {
 
   // Let's build the html error page.
   DictionaryValue strings;
-  strings.SetString(
-      LIT16("title"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_SSL_ERROR_PAGE_TITLE)));
-  strings.SetString(LIT16("headLine"), WideToUTF16Hack(error_info.title()));
-  strings.SetString(LIT16("description"),
-                    WideToUTF16Hack(error_info.details()));
-  strings.SetString(
-      LIT16("moreInfoTitle"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE)));
+  strings.SetString(L"title", l10n_util::GetString(IDS_SSL_ERROR_PAGE_TITLE));
+  strings.SetString(L"headLine", error_info.title());
+  strings.SetString(L"description", error_info.details());
+  strings.SetString(L"moreInfoTitle",
+                    l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
   SSLBlockingPage::SetExtraInfo(&strings, error_info.extra_information());
 
-  strings.SetString(
-      LIT16("back"),
-      WideToUTF16Hack(l10n_util::GetString(IDS_SSL_ERROR_PAGE_BACK)));
+  strings.SetString(L"back", l10n_util::GetString(IDS_SSL_ERROR_PAGE_BACK));
 
-  strings.SetString(
-      LIT16("textdirection"),
+  strings.SetString(L"textdirection",
       (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
-      LIT16("rtl") : LIT16("ltr"));
+      L"rtl" : L"ltr");
 
   static const StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(