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

chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

 // Copyright 2015 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/android/fullscreen/fullscreen_infobar_delegate.h"
 
 #include "base/android/jni_string.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
+#include "components/url_formatter/url_formatter.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "jni/FullscreenInfoBarDelegate_jni.h"
-#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 // static
 jlong LaunchFullscreenInfoBar(
     JNIEnv* env, jobject obj, jobject tab) {
   TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab);
   GURL origin = tab_android->GetURL().GetOrigin();
   FullscreenInfoBarDelegate* delegate = new FullscreenInfoBarDelegate(
       env, obj, origin);
@@ skipping 32 matching lines @@
 int FullscreenInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_FULLSCREEN;
 }
 
 base::string16 FullscreenInfoBarDelegate::GetMessageText() const {
   Profile* profile =
       ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
   std::string language =
       profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
   return l10n_util::GetStringFUTF16(
-      IDS_FULLSCREEN_INFOBAR_TEXT, net::FormatUrl(GURL(origin_), language));
+      IDS_FULLSCREEN_INFOBAR_TEXT,
+      url_formatter::FormatUrl(GURL(origin_), language));
 }
 
 base::string16 FullscreenInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_FULLSCREEN_INFOBAR_ALLOW_BUTTON :
       IDS_FULLSCREEN_INFOBAR_EXIT_FULLSCREEN_BUTTON);
 }
 
 bool FullscreenInfoBarDelegate::Accept() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_origin =
       base::android::ConvertUTF8ToJavaString(env, origin_.spec());
   Java_FullscreenInfoBarDelegate_onFullscreenAllowed(
       env, j_delegate_.obj(), j_origin.obj());
   return true;
 }
 
 bool FullscreenInfoBarDelegate::Cancel() {
   Java_FullscreenInfoBarDelegate_onFullscreenCancelled(
       base::android::AttachCurrentThread(), j_delegate_.obj());
   return true;
 }