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

chrome/browser/ui/bookmarks/bookmark_utils.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/search/search.h"
+#include "components/url_formatter/url_formatter.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
-#include "net/base/net_util.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drop_target_event.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_set.h"
 #endif
 
@@ skipping 277 matching lines @@
 base::string16 FormatBookmarkURLForDisplay(const GURL& url,
                                            const PrefService* prefs) {
   std::string languages;
   if (prefs)
     languages = prefs->GetString(prefs::kAcceptLanguages);
 
   // Because this gets re-parsed by FixupURL(), it's safe to omit the scheme
   // and trailing slash, and unescape most characters.  However, it's
   // important not to drop any username/password, or unescape anything that
   // changes the URL's meaning.
-  return net::FormatUrl(
-      url, languages,
-      net::kFormatUrlOmitAll & ~net::kFormatUrlOmitUsernamePassword,
-      net::UnescapeRule::SPACES, NULL, NULL, NULL);
+  return url_formatter::FormatUrl(
+      url, languages, url_formatter::kFormatUrlOmitAll &
+                          ~url_formatter::kFormatUrlOmitUsernamePassword,
+      net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
 }
 
 bool IsAppsShortcutEnabled(Profile* profile,
                            chrome::HostDesktopType host_desktop_type) {
   // Legacy supervised users can not have apps installed currently so there's no
   // need to show the apps shortcut.
   if (profile->IsLegacySupervised())
     return false;
 
   // Don't show the apps shortcut in ash since the app launcher is enabled.
@@ skipping 133 matching lines @@
       if (drop_parent->HasAncestor(node))
         return false;
     }
     return true;
   }
   // From another profile, always accept.
   return true;
 }
 
 }  // namespace chrome