| Index: chrome/browser/dom_distiller/tab_utils_android.cc
|
| diff --git a/chrome/browser/dom_distiller/tab_utils_android.cc b/chrome/browser/dom_distiller/tab_utils_android.cc
|
| index 83598cbe5bbbc90baa77c4a624117607c26604d7..7dcef2583d263abc792b135f8825af790effe5f1 100644
|
| --- a/chrome/browser/dom_distiller/tab_utils_android.cc
|
| +++ b/chrome/browser/dom_distiller/tab_utils_android.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "components/url_formatter/url_formatter.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/content_constants.h"
|
| #include "jni/DomDistillerTabUtils_jni.h"
|
| @@ -56,14 +57,10 @@ jstring GetFormattedUrlFromOriginalDistillerUrl(JNIEnv* env,
|
| // and pastes it into another program, that program may think the URL ends at
|
| // the space.
|
| return base::android::ConvertUTF16ToJavaString(
|
| - env,
|
| - net::FormatUrl(url,
|
| - languages,
|
| - net::kFormatUrlOmitAll,
|
| - net::UnescapeRule::NORMAL,
|
| - NULL,
|
| - NULL,
|
| - NULL)).Release();
|
| + env, url_formatter::FormatUrl(
|
| + url, languages, url_formatter::kFormatUrlOmitAll,
|
| + net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr))
|
| + .Release();
|
| }
|
|
|
| } // namespace android
|
|
|