Remove net wrappers around base/strings/escape.h

A number of string escaping functions were moved from //net to
//base/strings recently. crbug.com/1100760 was filed to move callers
to the new location and remove the net:: functions. This CL does that
and removes net/base/escape.h and .cc.

https://docs.google.com/document/d/1bNDZyi3uHN1aYf1ReWpa8R9DHM50JnHcouH3d3G8Na8/edit#

Bug: 1068052
Change-Id: Ic879d91e53f1d0f4fa925d7e4887e40ef8350709
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3583363
Reviewed-by: danakj <danakj@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/main@{#995437}

android_webview/browser/renderer_host/auto_login_parser.cc

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/notreached.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_split.h"
-#include "net/base/escape.h"
 
 namespace android_webview {
 
@@ -51,7 +51,7 @@ bool ParseHeader(const std::string& header,
        ++it) {
     const std::string& key = it->first;
     const std::string& value = it->second;
-    std::string unescaped_value = net::UnescapeBinaryURLComponent(value);
+    std::string unescaped_value = base::UnescapeBinaryURLComponent(value);
     if (key == "realm") {
       if (!MatchRealm(unescaped_value, realm_restriction))
         return false;

ash/assistant/ui/main_stage/assistant_query_view.cc

@@ -15,8 +15,8 @@
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/style/color_provider.h"
 #include "ash/public/cpp/style/scoped_light_mode_as_default.h"
+#include "base/strings/escape.h"
 #include "base/strings/utf_string_conversions.h"
-#include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/chromeos/styles/cros_styles.h"
@@ -134,12 +134,12 @@ void AssistantQueryView::SetText(const std::string& high_confidence_text,
   // |low_confidence_text| may be HTML escaped, so we need to unescape both
   // before displaying to avoid printing HTML entities to the user.
   const std::u16string& high_confidence_text_16 =
-      net::UnescapeForHTML(base::UTF8ToUTF16(high_confidence_text));
+      base::UnescapeForHTML(base::UTF8ToUTF16(high_confidence_text));
 
   high_confidence_label_->SetText(high_confidence_text_16);
 
   const std::u16string& low_confidence_text_16 =
-      net::UnescapeForHTML(base::UTF8ToUTF16(low_confidence_text));
+      base::UnescapeForHTML(base::UTF8ToUTF16(low_confidence_text));
 
   low_confidence_label_->SetText(low_confidence_text_16);
 }

ash/assistant/util/deep_link_util.cc

@@ -8,11 +8,11 @@
 
 #include "ash/assistant/util/i18n_util.h"
 #include "base/containers/contains.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chromeos/services/assistant/public/cpp/assistant_service.h"
-#include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
@@ -224,8 +224,8 @@ absl::optional<std::string> GetDeepLinkParam(
   const std::string key = GetDeepLinkParamKey(param);
   const auto it = params.find(key);
   return it != params.end()
-             ? absl::optional<std::string>(net::UnescapeBinaryURLComponent(
-                   it->second, net::UnescapeRule::REPLACE_PLUS_WITH_SPACE))
+             ? absl::optional<std::string>(base::UnescapeBinaryURLComponent(
+                   it->second, base::UnescapeRule::REPLACE_PLUS_WITH_SPACE))
              : absl::nullopt;
 }
 

ash/components/geolocation/simple_geolocation_request.cc

@@ -18,12 +18,12 @@
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
-#include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/resource_request.h"
@@ -155,7 +155,7 @@ GURL GeolocationRequestURL(const GURL& url) {
   std::string query(url.query());
   if (!query.empty())
     query += "&";
-  query += "key=" + net::EscapeQueryParamValue(api_key, true);
+  query += "key=" + base::EscapeQueryParamValue(api_key, true);
   GURL::Replacements replacements;
   replacements.SetQueryStr(query);
   return url.ReplaceComponents(replacements);

ash/components/timezone/timezone_request.cc

@@ -13,12 +13,12 @@
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
-#include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/resource_request.h"
@@ -182,7 +182,7 @@ GURL TimeZoneRequestURL(const GURL& url,
       query += "&";
       query += kKeyString;
       query += "=";
-      query += net::EscapeQueryParamValue(api_key, true);
+      query += base::EscapeQueryParamValue(api_key, true);
     }
   }
   if (!geoposition.timestamp.is_null()) {

chrome/browser/accessibility/accessibility_ui.cc

@@ -14,6 +14,7 @@
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/notreached.h"
+#include "base/strings/escape.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -40,7 +41,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui_data_source.h"
-#include "net/base/escape.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
@@ -123,7 +123,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
   target_data->SetIntKey(kProcessIdField, process_id);
   target_data->SetIntKey(kRoutingIdField, routing_id);
   target_data->SetStringKey(kUrlField, url.spec());
-  target_data->SetStringKey(kNameField, net::EscapeForHTML(name));
+  target_data->SetStringKey(kNameField, base::EscapeForHTML(name));
   target_data->SetIntKey(kPidField, base::GetProcId(handle));
   target_data->SetStringKey(kFaviconUrlField, favicon_url.spec());
   target_data->SetIntKey(kAccessibilityModeField, accessibility_mode.mode());

chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

@@ -11,6 +11,7 @@
 #include "base/i18n/string_search.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/escape.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
@@ -23,7 +24,6 @@
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/escape.h"
 #include "ui/base/models/tree_node_iterator.h"
 
 using bookmarks::BookmarkNode;

chrome/browser/android/bookmarks/partner_bookmarks_shim.h

@@ -14,12 +14,12 @@
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/raw_ptr.h"
+#include "base/strings/escape.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/url_formatter/url_formatter.h"
-#include "net/base/escape.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "url/gurl.h"
 

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

@@ -14,6 +14,7 @@
 #include "base/feature_list.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -37,7 +38,6 @@
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-#include "net/base/escape.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/simple_url_loader.h"

chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc

@@ -14,6 +14,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/raw_ptr.h"
+#include "base/strings/escape.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
@@ -25,7 +26,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/scoped_variations_ids_provider.h"
-#include "net/base/escape.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"

chrome/browser/ash/arc/fileapi/arc_content_file_system_url_util.cc

@@ -5,8 +5,8 @@
 #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_url_util.h"
 
 #include "base/files/file_path.h"
+#include "base/strings/escape.h"
 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
-#include "net/base/escape.h"
 #include "storage/browser/file_system/file_system_url.h"
 
 namespace arc {
@@ -19,11 +19,11 @@ const base::FilePath::CharType kContentFileSystemMountPointPath[] =
     FILE_PATH_LITERAL("/special/arc-content");
 
 std::string EscapeArcUrl(const GURL& arc_url) {
-  return net::EscapeQueryParamValue(arc_url.spec(), false);
+  return base::EscapeQueryParamValue(arc_url.spec(), false);
 }
 
 GURL UnescapeArcUrl(const std::string& escaped_arc_url) {
-  return GURL(net::UnescapeBinaryURLComponent(escaped_arc_url));
+  return GURL(base::UnescapeBinaryURLComponent(escaped_arc_url));
 }
 
 GURL ArcUrlToExternalFileUrl(const GURL& arc_url) {

chrome/browser/ash/arc/fileapi/arc_documents_provider_util.cc

@@ -9,10 +9,10 @@
 
 #include "ash/components/arc/mojom/file_system.mojom.h"
 #include "base/containers/contains.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "storage/browser/file_system/file_system_url.h"
 #include "url/gurl.h"
@@ -117,9 +117,10 @@ std::string EscapePathComponent(const std::string& name) {
 }
 
 std::string UnescapePathComponent(const std::string& escaped) {
-  return net::UnescapeURLComponent(
-      escaped, net::UnescapeRule::PATH_SEPARATORS |
-                   net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
+  return base::UnescapeURLComponent(
+      escaped,
+      base::UnescapeRule::PATH_SEPARATORS |
+          base::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
 }
 
 const char kDocumentsProviderMountPointName[] = "arc-documents-provider";
@@ -181,8 +182,8 @@ GURL BuildDocumentUrl(const std::string& authority,
                       const std::string& document_id) {
   return GURL(base::StringPrintf(
       "content://%s/document/%s",
-      net::EscapeQueryParamValue(authority, false /* use_plus */).c_str(),
-      net::EscapeQueryParamValue(document_id, false /* use_plus */).c_str()));
+      base::EscapeQueryParamValue(authority, false /* use_plus */).c_str(),
+      base::EscapeQueryParamValue(document_id, false /* use_plus */).c_str()));
 }
 
 std::vector<base::FilePath::StringType> GetExtensionsForArcMimeType(

chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc

@@ -18,6 +18,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/strings/escape.h"
 #include "base/system/sys_info.h"
 #include "base/task/bind_post_task.h"
 #include "base/task/thread_pool.h"
@@ -40,7 +41,6 @@
 #include "extensions/browser/api/file_handlers/mime_util.h"
 #include "mojo/public/cpp/platform/platform_handle.h"
 #include "mojo/public/cpp/system/platform_handle.h"
-#include "net/base/escape.h"
 #include "storage/browser/file_system/external_mount_points.h"
 #include "storage/browser/file_system/file_system_context.h"
 #include "url/gurl.h"
@@ -188,9 +188,9 @@ void ArcFileSystemBridge::GetFileName(const std::string& url,
   // It's generally not safe to unescape path separators in strings to be used
   // in file paths.
   if (url_decoded.is_empty() || !IsUrlAllowed(url_decoded) ||
-      !net::UnescapeBinaryURLComponentSafe(url_decoded.ExtractFileName(),
-                                           true /* fail_on_path_separators */,
-                                           &unescaped_file_name)) {
+      !base::UnescapeBinaryURLComponentSafe(url_decoded.ExtractFileName(),
+                                            true /* fail_on_path_separators */,
+                                            &unescaped_file_name)) {
     LOG(ERROR) << "Invalid URL: " << url << " " << url_decoded;
     std::move(callback).Run(absl::nullopt);
     return;

chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc

@@ -133,7 +133,7 @@ TEST_F(ArcFileSystemBridgeTest, GetFileNameNonASCII) {
   run_loop.Run();
 }
 
-// net::UnescapeURLComponent() leaves UTF-8 lock icons escaped, but they're
+// base::UnescapeURLComponent() leaves UTF-8 lock icons escaped, but they're
 // valid file names, so shouldn't be left escaped here.
 TEST_F(ArcFileSystemBridgeTest, GetFileNameLockIcon) {
   const GURL url("externalfile:abc:test-filesystem:/%F0%9F%94%92");

chrome/browser/ash/arc/fileapi/chrome_content_provider_url_util.cc

@@ -6,8 +6,8 @@
 
 #include <string>
 
+#include "base/strings/escape.h"
 #include "base/strings/string_util.h"
-#include "net/base/escape.h"
 
 namespace arc {
 
@@ -20,7 +20,7 @@ constexpr char kChromeContentProviderUrl[] =
 
 GURL EncodeToChromeContentProviderUrl(const GURL& url) {
   const std::string escaped =
-      net::EscapeQueryParamValue(url.spec(), false /* use_plus */);
+      base::EscapeQueryParamValue(url.spec(), false /* use_plus */);
   return GURL(kChromeContentProviderUrl).Resolve(escaped);
 }
 
@@ -31,7 +31,7 @@ GURL DecodeFromChromeContentProviderUrl(
                         base::CompareCase::SENSITIVE))
     return GURL();
   const std::string escaped = spec.substr(strlen(kChromeContentProviderUrl));
-  return GURL(net::UnescapeBinaryURLComponent(escaped));
+  return GURL(base::UnescapeBinaryURLComponent(escaped));
 }
 
 }  // namespace arc

chrome/browser/ash/crostini/crostini_terminal.cc

@@ -13,6 +13,7 @@
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/no_destructor.h"
+#include "base/strings/escape.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -47,7 +48,6 @@
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/escape.h"
 #include "storage/browser/file_system/external_mount_points.h"
 #include "storage/browser/file_system/file_system_url.h"
 #include "ui/base/base_window.h"
@@ -147,7 +147,7 @@ GURL GenerateTerminalURL(Profile* profile,
                          const std::string& cwd,
                          const std::vector<std::string>& terminal_args) {
   auto escape = [](std::string param) {
-    return net::EscapeQueryParamValue(param, /*use_plus=*/true);
+    return base::EscapeQueryParamValue(param, /*use_plus=*/true);
   };
   std::string start = base::StrCat({chrome::kChromeUIUntrustedTerminalURL,
                                     "html/terminal.html?command=vmshell"});

chrome/browser/ash/drive/file_system_util.cc

@@ -16,6 +16,7 @@
 #include "base/check_op.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/strings/escape.h"
 #include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,7 +28,6 @@
 #include "components/user_manager/user.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
-#include "net/base/escape.h"
 #include "services/network/public/cpp/network_connection_tracker.h"
 
 using content::BrowserThread;

chrome/browser/ash/file_manager/file_browser_handlers.cc

@@ -15,6 +15,7 @@
 #include "base/containers/contains.h"
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"
+#include "base/strings/escape.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/thread_pool.h"
 #include "chrome/browser/ash/file_manager/app_id.h"
@@ -40,7 +41,6 @@
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/url_pattern.h"
-#include "net/base/escape.h"
 #include "storage/browser/file_system/file_system_context.h"
 #include "storage/browser/file_system/file_system_url.h"
 #include "storage/common/file_system/file_system_info.h"
@@ -63,8 +63,8 @@ namespace {
 
 std::string EscapedUtf8ToLower(const std::string& str) {
   std::u16string utf16 = base::UTF8ToUTF16(
-      net::UnescapeURLComponent(str, net::UnescapeRule::NORMAL));
-  return net::EscapeUrlEncodedData(
+      base::UnescapeURLComponent(str, base::UnescapeRule::NORMAL));
+  return base::EscapeUrlEncodedData(
       base::UTF16ToUTF8(base::i18n::ToLower(utf16)),
       false /* do not replace space with plus */);
 }