chrome/browser/notifications/notification_exceptions_table_model_unittest.cc - Issue 6044006: Remove wstring from l10n_util. Part 3....

Unified Diff: chrome/browser/notifications/notification_exceptions_table_model_unittest.cc

Issue 6044006: Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« chrome/browser/extensions/pack_extension_job.cc ('K') | « chrome/browser/notifications/notification_exceptions_table_model.cc ('k') | chrome/browser/omnibox_search_hint.cc » ('j') | chrome/browser/omnibox_search_hint.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_exceptions_table_model_unittest.cc

===================================================================

--- chrome/browser/notifications/notification_exceptions_table_model_unittest.cc (revision 70263)

+++ 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"

viettrungluu 2010/12/29 19:04:15 Could you mark this with a "TODO: remove when conv

Avi (use Gerrit) 2010/12/29 19:40:49 Done.

#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