Revert of Move net::FormatUrl and friends outside of //net and into //components

chrome/browser/dom_distiller/tab_utils_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_distiller/tab_utils_android.h"
 
 #include <string>
 
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/dom_distiller/tab_utils.h"
 #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"
 #include "net/base/net_util.h"
 #include "url/gurl.h"
 
 namespace android {
 
 void DistillCurrentPageAndView(JNIEnv* env,
                                jclass clazz,
@@ skipping 24 matching lines @@
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
   }
 
   if (url.spec().length() > content::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
 
   // Note that we can't unescape spaces here, because if the user copies this
   // and pastes it into another program, that program may think the URL ends at
   // the space.
   return base::android::ConvertUTF16ToJavaString(
-             env, url_formatter::FormatUrl(
-                      url, languages, url_formatter::kFormatUrlOmitAll,
-                      net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr))
-      .Release();
+             env,
+             net::FormatUrl(url,
+                            languages,
+                            net::kFormatUrlOmitAll,
+                            net::UnescapeRule::NORMAL,
+                            NULL,
+                            NULL,
+                            NULL)).Release();
 }
 
 }  // namespace android
 
 bool RegisterDomDistillerTabUtils(JNIEnv* env) {
   return android::RegisterNativesImpl(env);
 }