chrome/browser/notifications/notification_exceptions_table_model_unittest.cc - Issue 6044007: Remove wstring from TableModel....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6044007: Remove wstring from TableModel.... (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

Download patch

« chrome/browser/notifications/notification_exceptions_table_model.h ('K') | « chrome/browser/notifications/notification_exceptions_table_model.cc ('k') | chrome/browser/plugin_exceptions_table_model.h » ('j') | chrome/browser/search_engines/template_url_table_model.h » ('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 70272)

+++ chrome/browser/notifications/notification_exceptions_table_model_unittest.cc (working copy)

@@ -74,34 +74,29 @@

FillData();

EXPECT_EQ(5, model_->RowCount());

- EXPECT_EQ(L"allowed.com",

+ EXPECT_EQ(ASCIIToUTF16("allowed.com"),

model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER));

- EXPECT_EQ(UTF16ToWideHack(

- l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),

+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON),

model_->GetText(0, IDS_EXCEPTIONS_ACTION_HEADER));

- EXPECT_EQ(L"denied.com",

+ EXPECT_EQ(ASCIIToUTF16("denied.com"),

model_->GetText(1, IDS_EXCEPTIONS_HOSTNAME_HEADER));

- EXPECT_EQ(UTF16ToWideHack(

- l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),

+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON),

model_->GetText(1, IDS_EXCEPTIONS_ACTION_HEADER));

- EXPECT_EQ(L"denied2.com",

+ EXPECT_EQ(ASCIIToUTF16("denied2.com"),

model_->GetText(2, IDS_EXCEPTIONS_HOSTNAME_HEADER));

- EXPECT_EQ(UTF16ToWideHack(

- l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),

+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON),

model_->GetText(2, IDS_EXCEPTIONS_ACTION_HEADER));

- EXPECT_EQ(L"e-allowed2.com",

+ EXPECT_EQ(ASCIIToUTF16("e-allowed2.com"),

model_->GetText(3, IDS_EXCEPTIONS_HOSTNAME_HEADER));

- EXPECT_EQ(UTF16ToWideHack(

- l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)),

+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON),

model_->GetText(3, IDS_EXCEPTIONS_ACTION_HEADER));

- EXPECT_EQ(L"f-denied3.com",

+ EXPECT_EQ(ASCIIToUTF16("f-denied3.com"),

model_->GetText(4, IDS_EXCEPTIONS_HOSTNAME_HEADER));

- EXPECT_EQ(UTF16ToWideHack(

- l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)),

+ EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON),

model_->GetText(4, IDS_EXCEPTIONS_ACTION_HEADER));

}