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

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 2012 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.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <objc/runtime.h>
 #include <cmath>
 
 #include "base/ios/block_types.h"
@@ skipping 10 matching lines @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "components/url_formatter/url_formatter.h"
 #import "ios/net/nsurlrequest_util.h"
 #include "ios/public/provider/web/web_ui_ios.h"
 #import "ios/web/history_state_util.h"
 #include "ios/web/interstitials/web_interstitial_impl.h"
 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #import "ios/web/navigation/web_load_params.h"
@@ skipping 31 matching lines @@
 #import "ios/web/web_state/ui/crw_swipe_recognizer_provider.h"
 #import "ios/web/web_state/ui/crw_ui_web_view_web_controller.h"
 #import "ios/web/web_state/ui/crw_web_controller+protected.h"
 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"
 #import "ios/web/web_state/web_controller_observer_bridge.h"
 #include "ios/web/web_state/web_state_facade_delegate.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_util.h"
 #import "ui/base/ios/cru_context_menu_holder.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 using base::UserMetricsAction;
 using web::NavigationManagerImpl;
 using web::WebState;
 using web::WebStateImpl;
 
@@ skipping 3473 matching lines @@
   std::string href;
   if (element->GetString("href", &href)) {
     mutableInfo[web::kContextLinkURLString] = base::SysUTF8ToNSString(href);
     GURL linkURL(href);
     if (linkURL.SchemeIs(url::kJavaScriptScheme)) {
       title = @"JavaScript";
     } else {
       DCHECK(web::GetWebClient());
       const std::string& acceptLangs = web::GetWebClient()->GetAcceptLangs(
           self.webStateImpl->GetBrowserState());
-      base::string16 urlText =
-          url_formatter::FormatUrl(GURL(href), acceptLangs);
+      base::string16 urlText = net::FormatUrl(GURL(href), acceptLangs);
       title = base::SysUTF16ToNSString(urlText);
     }
   }
   std::string src;
   if (element->GetString("src", &src)) {
     mutableInfo[web::kContextImageURLString] = base::SysUTF8ToNSString(src);
     if (!title)
       title = base::SysUTF8ToNSString(src);
     if ([title hasPrefix:@"data:"])
       title = @"";
@@ skipping 276 matching lines @@
   if (!_externalRequest || !_externalRequest->window_name)
     return @"";
   return _externalRequest->window_name;
 }
 
 - (void)resetExternalRequest {
   _externalRequest.reset();
 }
 
 @end