components/sessions/serialized_navigation_entry.cc - Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ 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: components/sessions/serialized_navigation_entry.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ 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 | « components/policy/core/common/registry_dict_win.cc ('k') | components/sessions/serialized_navigation_entry_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sessions/serialized_navigation_entry.cc

diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc

index 5506220d3eba6c442a23a5505ae60a211cbce9d3..061c422e7a0968b3b88e46190ab510b2fa1ec5a5 100644

--- a/components/sessions/serialized_navigation_entry.cc

+++ b/components/sessions/serialized_navigation_entry.cc

@@ -69,7 +69,7 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(

content::Referrer(GURL(sync_data.referrer()),

blink::WebReferrerPolicyDefault);

navigation.virtual_url_ = GURL(sync_data.virtual_url());

- navigation.title_ = UTF8ToUTF16(sync_data.title());

+ navigation.title_ = base::UTF8ToUTF16(sync_data.title());

navigation.page_state_ =

content::PageState::CreateFromEncodedData(sync_data.state());

@@ -141,7 +141,7 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(

static_cast<content::PageTransition>(transition);

navigation.timestamp_ = base::Time();

- navigation.search_terms_ = UTF8ToUTF16(sync_data.search_terms());

+ navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms());

if (sync_data.has_favicon_url())

navigation.favicon_url_ = GURL(sync_data.favicon_url());

@@ -368,7 +368,7 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {

sync_data.set_virtual_url(virtual_url_.spec());

// FIXME(zea): Support referrer policy?

sync_data.set_referrer(referrer_.url.spec());

- sync_data.set_title(UTF16ToUTF8(title_));

+ sync_data.set_title(base::UTF16ToUTF8(title_));

// Page transition core.

COMPILE_ASSERT(content::PAGE_TRANSITION_LAST_CORE ==

@@ -449,7 +449,7 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {

// The full-resolution timestamp works as a global ID.

sync_data.set_global_id(timestamp_.ToInternalValue());

- sync_data.set_search_terms(UTF16ToUTF8(search_terms_));

+ sync_data.set_search_terms(base::UTF16ToUTF8(search_terms_));

sync_data.set_http_status_code(http_status_code_);