net: Put more functions from escape.h into net namespace.

chrome/browser/extensions/extension_updater.cc

 // Copyright (c) 2011 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/extensions/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/compiler_specific.h"
+#include "base/file_util.h"
 #include "base/logging.h"
-#include "base/file_util.h"
 #include "base/memory/scoped_handle.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/threading/thread.h"
 #include "base/time.h"
-#include "base/threading/thread.h"
 #include "base/version.h"
-#include "crypto/sha2.h"
-#include "content/common/notification_service.h"
-#include "content/common/notification_source.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/utility_process_host.h"
+#include "content/common/notification_service.h"
+#include "content/common/notification_source.h"
+#include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 #if defined(OS_MACOSX)
 #include "base/sys_string_conversions.h"
 #endif
 
 #define SEND_ACTIVE_PINGS 1
@@ skipping 125 matching lines @@
   // Compute the string we'd append onto the full_url_, and see if it fits.
   std::vector<std::string> parts;
   parts.push_back("id=" + id);
   parts.push_back("v=" + version);
   parts.push_back("uc");
 
   if (!update_url_data.empty()) {
     // Make sure the update_url_data string is escaped before using it so that
     // there is no chance of overriding the id or v other parameter value
     // we place into the x= value.
-    parts.push_back("ap=" + EscapeQueryParamValue(update_url_data, true));
+    parts.push_back("ap=" + net::EscapeQueryParamValue(update_url_data, true));
   }
 
   // Append rollcall and active ping parameters.
   if (base_url_.DomainIs("google.com")) {
     std::string ping_value;
     pings_[id] = PingData(0, 0);
 
     if (ping_data.rollcall_days == kNeverPinged ||
         ping_data.rollcall_days > 0) {
       ping_value += "r=" + base::IntToString(ping_data.rollcall_days);
       pings_[id].rollcall_days = ping_data.rollcall_days;
     }
 #if SEND_ACTIVE_PINGS
     if (ping_data.active_days == kNeverPinged || ping_data.active_days > 0) {
       if (!ping_value.empty())
         ping_value += "&";
       ping_value += "a=" + base::IntToString(ping_data.active_days);
       pings_[id].active_days = ping_data.active_days;
     }
 #endif  // SEND_ACTIVE_PINGS
     if (!ping_value.empty())
-      parts.push_back("ping=" + EscapeQueryParamValue(ping_value, true));
+      parts.push_back("ping=" + net::EscapeQueryParamValue(ping_value, true));
   }
 
   std::string extra = full_url_.has_query() ? "&" : "?";
-  extra += "x=" + EscapeQueryParamValue(JoinString(parts, '&'), true);
+  extra += "x=" + net::EscapeQueryParamValue(JoinString(parts, '&'), true);
 
   // Check against our max url size, exempting the first extension added.
   int new_size = full_url_.possibly_invalid_spec().size() + extra.size();
   if (!extension_ids_.empty() && new_size > kExtensionsManifestMaxURLSize) {
     UMA_HISTOGRAM_PERCENTAGE("Extensions.UpdateCheckHitUrlSizeLimit", 1);
     return false;
   }
   UMA_HISTOGRAM_PERCENTAGE("Extensions.UpdateCheckHitUrlSizeLimit", 0);
 
   // We have room so go ahead and add the extension.
@@ skipping 1013 matching lines @@
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.insert(*i);
 }
 
 void ExtensionUpdater::RemoveFromInProgress(const std::set<std::string>& ids) {
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.erase(*i);
 }