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

components/content_settings/core/browser/content_settings_usages_state.cc

 // Copyright 2013 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 "components/content_settings/core/browser/content_settings_usages_state.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "net/base/net_util.h"
+#include "components/url_formatter/url_formatter.h"
 
 ContentSettingsUsagesState::CommittedDetails::CommittedDetails()
     : current_url_valid(false) {
 }
 
 ContentSettingsUsagesState::CommittedDetails::~CommittedDetails() {}
 
 ContentSettingsUsagesState::ContentSettingsUsagesState(
     HostContentSettingsMap* host_content_settings_map,
     ContentSettingsType type,
@@ skipping 76 matching lines @@
     if (saved_setting != i->second)
       *tab_state_flags |= TABSTATE_HAS_CHANGED;
     if (saved_setting != CONTENT_SETTING_ASK)
       *tab_state_flags |= TABSTATE_HAS_ANY_ICON;
   }
 }
 
 std::string ContentSettingsUsagesState::GURLToFormattedHost(
     const GURL& url) const {
   base::string16 display_host;
-  net::AppendFormattedHost(url, pref_service_->GetString(accept_language_pref_),
-                           &display_host);
+  url_formatter::AppendFormattedHost(
+      url, pref_service_->GetString(accept_language_pref_), &display_host);
   return base::UTF16ToUTF8(display_host);
 }