chrome/browser/policy/managed_bookmarks_policy_handler.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

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/policy/managed_bookmarks_policy_handler.cc

Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again now that CQ is fixed Created 5 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

« no previous file with comments | « chrome/browser/permissions/permission_bubble_request_impl.cc ('k') | chrome/browser/policy/url_blacklist_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/managed_bookmarks_policy_handler.cc

diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler.cc b/chrome/browser/policy/managed_bookmarks_policy_handler.cc

index 8c71fd3fcfa0cb9a12dff45b40fe95ea4d029e94..75c8e78bc7a5d10eb6edd820897e1478c7d29961 100644

--- a/chrome/browser/policy/managed_bookmarks_policy_handler.cc

+++ b/chrome/browser/policy/managed_bookmarks_policy_handler.cc

@@ -10,7 +10,7 @@

#include "components/bookmarks/managed/managed_bookmarks_tracker.h"

#include "components/policy/core/browser/policy_error_map.h"

#include "components/policy/core/common/policy_map.h"

-#include "components/url_fixer/url_fixer.h"

+#include "components/url_formatter/url_fixer.h"

#include "policy/policy_constants.h"

#include "url/gurl.h"

@@ -71,7 +71,7 @@ void ManagedBookmarksPolicyHandler::FilterBookmarks(base::ListValue* list) {

} else {

// Make sure the URL is valid before passing a bookmark to the pref.

dict->Remove(ManagedBookmarksTracker::kChildren, NULL);

- GURL gurl = url_fixer::FixupURL(url, "");

+ GURL gurl = url_formatter::FixupURL(url, std::string());

if (!gurl.is_valid()) {

it = list->Erase(it, NULL);

continue;