Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/notifications/notification_exceptions_table_model_unittest.cc

Index: chrome/browser/notifications/notification_exceptions_table_model_unittest.cc
===================================================================
--- chrome/browser/notifications/notification_exceptions_table_model_unittest.cc	(revision 70282)
+++ chrome/browser/notifications/notification_exceptions_table_model_unittest.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "chrome/browser/notifications/notification_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/test/testing_profile.h"
@@ -75,27 +76,32 @@
 
   EXPECT_EQ(L"allowed.com",
             model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),
             model_->GetText(0, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"denied.com",
             model_->GetText(1, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(1, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"denied2.com",
             model_->GetText(2, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(2, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"e-allowed2.com",
             model_->GetText(3, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),
             model_->GetText(3, IDS_EXCEPTIONS_ACTION_HEADER));
 
   EXPECT_EQ(L"f-denied3.com",
             model_->GetText(4, IDS_EXCEPTIONS_HOSTNAME_HEADER));
-  EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON),
+  EXPECT_EQ(UTF16ToWideHack(
+              l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),
             model_->GetText(4, IDS_EXCEPTIONS_ACTION_HEADER));
 }
 
Property changes on: chrome/browser/notifications/notification_exceptions_table_model_unittest.cc
___________________________________________________________________
Added: svn:eol-style
   + LF