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

ios/web/navigation/navigation_item_impl.mm

 // 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 "ios/web/navigation/navigation_item_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/base/net_util.h"
+#include "components/url_formatter/url_formatter.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 // Returns a new unique ID for use in NavigationItem during construction.  The
 // returned ID is guaranteed to be nonzero (which is the "no ID" indicator).
 static int GetUniqueIDInConstructor() {
   static int unique_id_counter = 0;
   return ++unique_id_counter;
@@ skipping 121 matching lines @@
     return title_;
 
   // More complicated cases will use the URLs as the title. This result we will
   // cache since it's more complicated to compute.
   if (!cached_display_title_.empty())
     return cached_display_title_;
 
   // Use the virtual URL first if any, and fall back on using the real URL.
   base::string16 title;
   if (!virtual_url_.is_empty()) {
-    title = net::FormatUrl(virtual_url_, languages);
+    title = url_formatter::FormatUrl(virtual_url_, languages);
   } else if (!url_.is_empty()) {
-    title = net::FormatUrl(url_, languages);
+    title = url_formatter::FormatUrl(url_, languages);
   }
 
   // For file:// URLs use the filename as the title, not the full path.
   if (url_.SchemeIsFile()) {
     base::string16::size_type slashpos = title.rfind('/');
     if (slashpos != base::string16::npos)
       title = title.substr(slashpos + 1);
   }
 
   const int kMaxTitleChars = 4 * 1024;
@@ skipping 113 matching lines @@
   http_request_headers_.reset();
 }
 
 void NavigationItemImpl::ResetForCommit() {
   // Any state that only matters when a navigation item is pending should be
   // cleared here.
   set_is_renderer_initiated(false);
 }
 
 }  // namespace web