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

chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

 // 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 "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/url_formatter/url_formatter.h"
+#include "net/base/net_util.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/vector_icons_public2.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/bubble/bubble_delegate.h"
@@ skipping 177 matching lines @@
   DCHECK(!requests.empty());
 
   RemoveAllChildViews(true);
   customize_comboboxes_.clear();
   set_close_on_esc(true);
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
-  hostname_ = url_formatter::FormatUrl(
-      requests[0]->GetRequestingHostname(), languages,
-      url_formatter::kFormatUrlOmitUsernamePassword |
-          url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
-      net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
+  hostname_ = net::FormatUrl(requests[0]->GetRequestingHostname(),
+                             languages,
+                             net::kFormatUrlOmitUsernamePassword |
+                             net::kFormatUrlOmitTrailingSlashOnBareHostname,
+                             net::UnescapeRule::SPACES,
+                             nullptr, nullptr, nullptr);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   for (size_t index = 0; index < requests.size(); index++) {
     DCHECK(index < accept_state.size());
     // The row is laid out containing a leading-aligned label area and a
     // trailing column which will be filled if there are multiple permission
     // requests.
     views::View* row = new views::View();
     views::GridLayout* row_layout = new views::GridLayout(row);
     row->SetLayoutManager(row_layout);
@@ skipping 271 matching lines @@
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }