net: Move UnescapeRule into the net namespace.

net/base/escape.h

 // 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.
 
 #ifndef NET_BASE_ESCAPE_H_
 #define NET_BASE_ESCAPE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "net/base/net_export.h"
 
+namespace net {
+
+// Escaping --------------------------------------------------------------------
+
+// Escapes a file.  This includes:
+// non-printable, non-7bit, and (including space)  "#%:<>?[\]^`{|}
+NET_EXPORT std::string EscapePath(const std::string& path);
+
+// Escapes application/x-www-form-urlencoded content.  This includes:
+// non-printable, non-7bit, and (including space)  ?>=<;+'&%$#"![\]^`{|}
+// Space is escaped as + (if use_plus is true) and other special characters
+// as %XX (hex).
+NET_EXPORT std::string EscapeUrlEncodedData(const std::string& path,
+                                            bool use_plus);
+
+// Escapes all non-ASCII input.
+NET_EXPORT std::string EscapeNonASCII(const std::string& input);
+
+// Escapes characters in text suitable for use as an external protocol handler
+// command.
+// We %XX everything except alphanumerics and %-_.!~*'() and the restricted
+// chracters (;/?:@&=+$,).
+NET_EXPORT std::string EscapeExternalHandlerValue(const std::string& text);
+
+// Appends the given character to the output string, escaping the character if
+// the character would be interpretted as an HTML delimiter.
+NET_EXPORT void AppendEscapedCharForHTML(char c, std::string* output);
+
+// Escapes chars that might cause this text to be interpretted as HTML tags.
+NET_EXPORT std::string EscapeForHTML(const std::string& text);
+NET_EXPORT string16 EscapeForHTML(const string16& text);
+
 // Unescaping ------------------------------------------------------------------
 
 class UnescapeRule {
  public:
   // A combination of the following flags that is passed to the unescaping
   // functions.
   typedef uint32 Type;
 
   enum {
     // Don't unescape anything at all.
@@ skipping 22 matching lines @@
     // Unescapes control characters such as %01. This INCLUDES NULLs. This is
     // used for rare cases such as data: URL decoding where the result is binary
     // data. You should not use this for normal URLs!
     CONTROL_CHARS = 8,
 
     // URL queries use "+" for space. This flag controls that replacement.
     REPLACE_PLUS_WITH_SPACE = 16,
   };
 };
 
-namespace net {
-
-// Escaping --------------------------------------------------------------------
-
-// escape a file.  this includes:
-// non-printable, non-7bit, and (including space)  "#%:<>?[\]^`{|}
-NET_EXPORT std::string EscapePath(const std::string& path);
-
-// Escape application/x-www-form-urlencoded content.  This includes:
-// non-printable, non-7bit, and (including space)  ?>=<;+'&%$#"![\]^`{|}
-// Space is escaped as + (if use_plus is true) and other special characters
-// as %XX (hex).
-NET_EXPORT std::string EscapeUrlEncodedData(const std::string& path,
-                                            bool use_plus);
-
-// Escape all non-ASCII input.
-NET_EXPORT std::string EscapeNonASCII(const std::string& input);
-
-// Escapes characters in text suitable for use as an external protocol handler
-// command.
-// We %XX everything except alphanumerics and %-_.!~*'() and the restricted
-// chracters (;/?:@&=+$,).
-NET_EXPORT std::string EscapeExternalHandlerValue(const std::string& text);
-
-// Append the given character to the output string, escaping the character if
-// the character would be interpretted as an HTML delimiter.
-NET_EXPORT void AppendEscapedCharForHTML(char c, std::string* output);
-
-// Escape chars that might cause this text to be interpretted as HTML tags.
-NET_EXPORT std::string EscapeForHTML(const std::string& text);
-NET_EXPORT string16 EscapeForHTML(const string16& text);
-
 // Unescapes |escaped_text| and returns the result.
 // Unescaping consists of looking for the exact pattern "%XX", where each X is
 // a hex digit, and converting to the character with the numerical value of
 // those digits. Thus "i%20=%203%3b" unescapes to "i = 3;".
 //
 // Watch out: this doesn't necessarily result in the correct final result,
 // because the encoding may be unknown. For example, the input might be ASCII,
 // which, after unescaping, is supposed to be interpreted as UTF-8, and then
 // converted into full UTF-16 chars. This function won't tell you if any
 // conversions need to take place, it only unescapes.
@@ skipping 13 matching lines @@
 // offset will be set to string16::npos. |offset[s]_for_adjustment| may be NULL.
 NET_EXPORT string16 UnescapeAndDecodeUTF8URLComponent(
     const std::string& text,
     UnescapeRule::Type rules,
     size_t* offset_for_adjustment);
 NET_EXPORT string16 UnescapeAndDecodeUTF8URLComponentWithOffsets(
     const std::string& text,
     UnescapeRule::Type rules,
     std::vector<size_t>* offsets_for_adjustment);
 
-// Unescape the following ampersand character codes from |text|:
+// Unescapes the following ampersand character codes from |text|:
 // &lt; &gt; &amp; &quot; &#39;
 NET_EXPORT string16 UnescapeForHTML(const string16& text);
 
 // Deprecated ------------------------------------------------------------------
 
 // Escapes characters in text suitable for use as a query parameter value.
 // We %XX everything except alphanumerics and -_.!~*'()
 // Spaces change to "+" unless you pass usePlus=false.
 // This is basically the same as encodeURIComponent in javascript.
 // For the string16 version, we do a conversion to charset before encoding the
@@ skipping 23 matching lines @@
   void operator()(size_t& offset);
 
   const Adjustments& adjustments;
 };
 
 }  // namespace internal
 
 }  // namespace net
 
 #endif  // NET_BASE_ESCAPE_H_