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

chrome/browser/chrome_quota_permission_context.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/chrome_quota_permission_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
+#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
-#include "net/base/net_util.h"
 #include "storage/common/quota/quota_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 // If the site requested larger quota than this threshold, show a different
 // message to the user.
 const int64 kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
 
@@ skipping 49 matching lines @@
 
 QuotaPermissionRequest::~QuotaPermissionRequest() {}
 
 int QuotaPermissionRequest::GetIconID() const {
   // TODO(gbillock): get the proper image here
   return IDR_INFOBAR_WARNING;
 }
 
 base::string16 QuotaPermissionRequest::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
-      (requested_quota_ > kRequestLargeQuotaThreshold ?
-          IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION :
-          IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
-      net::FormatUrl(origin_url_, display_languages_,
-                     net::kFormatUrlOmitUsernamePassword |
-                     net::kFormatUrlOmitTrailingSlashOnBareHostname,
-                     net::UnescapeRule::SPACES, NULL, NULL, NULL)
-  );
+      (requested_quota_ > kRequestLargeQuotaThreshold
+           ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION
+           : IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
+      url_formatter::FormatUrl(
+          origin_url_, display_languages_,
+          url_formatter::kFormatUrlOmitUsernamePassword |
+              url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
+          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
 }
 
 base::string16 QuotaPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT);
 }
 
 bool QuotaPermissionRequest::HasUserGesture() const {
   return user_gesture_;
 }
 
@@ skipping 98 matching lines @@
     context_->DispatchCallbackOnIOThread(
         callback_,
         content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_CANCELLED);
   }
 }
 
 base::string16 RequestQuotaInfoBarDelegate::GetMessageText() const {
   // If the site requested larger quota than this threshold, show a different
   // message to the user.
   return l10n_util::GetStringFUTF16(
-      (requested_quota_ > kRequestLargeQuotaThreshold ?
-          IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION :
-          IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
-      net::FormatUrl(origin_url_, display_languages_,
-                     net::kFormatUrlOmitUsernamePassword |
-                     net::kFormatUrlOmitTrailingSlashOnBareHostname,
-                     net::UnescapeRule::SPACES, NULL, NULL, NULL)
-      );
+      (requested_quota_ > kRequestLargeQuotaThreshold
+           ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION
+           : IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
+      url_formatter::FormatUrl(
+          origin_url_, display_languages_,
+          url_formatter::kFormatUrlOmitUsernamePassword |
+              url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname,
+          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
 }
 
 bool RequestQuotaInfoBarDelegate::Accept() {
   context_->DispatchCallbackOnIOThread(
       callback_,
       content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW);
   return true;
 }
 
 bool RequestQuotaInfoBarDelegate::Cancel() {
@@ skipping 81 matching lines @@
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeQuotaPermissionContext::DispatchCallbackOnIOThread,
                    this, callback, response));
     return;
   }
 
   callback.Run(response);
 }
 
 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}