Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: components/history/core/browser/url_database.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 | « components/history/core/browser/BUILD.gn ('k') | components/nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/history/core/browser/url_database.cc
diff --git a/components/history/core/browser/url_database.cc b/components/history/core/browser/url_database.cc
index 65ac67e8e9717e9a5f8511b7fd3d7d0e2b5e4a95..48847b4bbed852155b284defd9d69e091ed548b1 100644
--- a/components/history/core/browser/url_database.cc
+++ b/components/history/core/browser/url_database.cc
@@ -12,7 +12,7 @@
#include "base/memory/scoped_vector.h"
#include "base/strings/utf_string_conversions.h"
#include "components/history/core/browser/keyword_search_term.h"
-#include "net/base/net_util.h"
+#include "components/url_formatter/url_formatter.h"
#include "sql/statement.h"
#include "url/gurl.h"
@@ -372,7 +372,8 @@ bool URLDatabase::GetTextMatches(const base::string16& query,
// |query_words| won't be shown to user - therefore we can use empty
// |languages| to reduce dependency (no need to call PrefService).
base::string16 ascii = base::ASCIIToUTF16(gurl.host());
- base::string16 utf = net::IDNToUnicode(gurl.host(), std::string());
+ base::string16 utf =
+ url_formatter::IDNToUnicode(gurl.host(), std::string());
if (ascii != utf)
query_parser_.ExtractQueryWords(utf, &query_words);
}
« no previous file with comments | « components/history/core/browser/BUILD.gn ('k') | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698