content/browser/frame_host/render_frame_host_manager_unittest.cc - Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace.

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: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager_unittest.cc

diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc

index 630262cc60a2905bf21a63506ac45cc9ca25125d..214c62d4a33f79d27d6833a77debf113d1bdf4e5 100644

--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc

+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc

@@ -260,7 +260,7 @@ TEST_F(RenderFrameHostManagerTest, FilterMessagesWhileSwappedOut) {

contents()->GetRenderManagerForTesting()->current_host());

// Send an update title message and make sure it works.

- const base::string16 ntp_title = ASCIIToUTF16("NTP Title");

+ const base::string16 ntp_title = base::ASCIIToUTF16("NTP Title");

blink::WebTextDirection direction = blink::WebTextDirectionLeftToRight;

EXPECT_TRUE(ntp_rvh->OnMessageReceived(

ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 0, ntp_title, direction)));

@@ -288,7 +288,7 @@ TEST_F(RenderFrameHostManagerTest, FilterMessagesWhileSwappedOut) {

dest_rvh->SendNavigate(101, kDestUrl);

// The new RVH should be able to update its title.

- const base::string16 dest_title = ASCIIToUTF16("Google");

+ const base::string16 dest_title = base::ASCIIToUTF16("Google");

EXPECT_TRUE(dest_rvh->OnMessageReceived(

ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 101, dest_title,

direction)));

@@ -308,7 +308,7 @@ TEST_F(RenderFrameHostManagerTest, FilterMessagesWhileSwappedOut) {

MockRenderProcessHost* ntp_process_host =

static_cast<MockRenderProcessHost*>(ntp_rvh->GetProcess());

ntp_process_host->sink().ClearMessages();

- const base::string16 msg = ASCIIToUTF16("Message");

+ const base::string16 msg = base::ASCIIToUTF16("Message");

bool result = false;

base::string16 unused;

ViewHostMsg_RunBeforeUnloadConfirm before_unload_msg(