chrome/browser/geolocation/geolocation_permission_context_unittest.cc - Issue 3127009: Convert infobar APIs to UTF-16.

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/geolocation/geolocation_permission_context_unittest.cc

Issue 3127009: Convert infobar APIs to UTF-16. (Closed)

Patch Set: works Created 10 years, 4 months 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/extensions/extension_install_ui.cc ('K') | « chrome/browser/geolocation/geolocation_permission_context.cc ('k') | chrome/browser/gtk/infobar_gtk.h » ('j') | chrome/browser/tab_contents/tab_contents_ssl_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

index b31608a8283af2308d940ae9c19f30a089806068..57659c36752acd87c9c5a590742f0947c2aaa68c 100644

--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

@@ -184,7 +184,7 @@ TEST_F(GeolocationPermissionContextTests, QueuedPermission) {

ConfirmInfoBarDelegate* infobar_0 =

contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();

ASSERT_TRUE(infobar_0);

- std::wstring text_0 = infobar_0->GetMessageText();

+ string16 text_0 = infobar_0->GetMessageText();

// Accept the first frame.

infobar_0->Accept();

@@ -201,7 +201,7 @@ TEST_F(GeolocationPermissionContextTests, QueuedPermission) {

ConfirmInfoBarDelegate* infobar_1 =

contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();

ASSERT_TRUE(infobar_1);

- std::wstring text_1 = infobar_1->GetMessageText();

+ string16 text_1 = infobar_1->GetMessageText();

EXPECT_NE(text_0, text_1);

// Cancel (block) this frame.

@@ -248,7 +248,7 @@ TEST_F(GeolocationPermissionContextTests, CancelGeolocationPermissionRequest) {

ConfirmInfoBarDelegate* infobar_0 =

contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();

ASSERT_TRUE(infobar_0);

- std::wstring text_0 = infobar_0->GetMessageText();

+ string16 text_0 = infobar_0->GetMessageText();

// Simulate the frame going away, ensure the infobar for this frame

// is removed and the next pending infobar is created.

@@ -262,7 +262,7 @@ TEST_F(GeolocationPermissionContextTests, CancelGeolocationPermissionRequest) {

ConfirmInfoBarDelegate* infobar_1 =

contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();

ASSERT_TRUE(infobar_1);

- std::wstring text_1 = infobar_1->GetMessageText();

+ string16 text_1 = infobar_1->GetMessageText();

EXPECT_NE(text_0, text_1);

// Allow this frame.