Move the json-related files into a separate json directory. This hopefully al...

net/base/net_util.cc

 // Copyright (c) 2009 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 "net/base/net_util.h"
 
 #include <algorithm>
 #include <map>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
@@ skipping 14 matching lines @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #endif
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
+#include "base/json/string_escape.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
-#include "base/string_escape.h"
 #include "base/string_piece.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "grit/net_resources.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_parse.h"
@@ skipping 874 matching lines @@
       NetModule::GetResource(IDR_DIR_HEADER_HTML));
   // This can be null in unit tests.
   DLOG_IF(WARNING, header.empty()) <<
       "Missing resource: directory listing header";
 
   std::string result;
   if (!header.empty())
     result.assign(header.data(), header.size());
 
   result.append("<script>start(");
-  string_escape::JsonDoubleQuote(title, true, &result);
+  base::JsonDoubleQuote(title, true, &result);
   result.append(");</script>\n");
 
   return result;
 }
 
 inline bool IsHostCharAlpha(char c) {
   // We can just check lowercase because uppercase characters have already been
   // normalized.
   return (c >= 'a') && (c <= 'z');
 }
@@ skipping 40 matching lines @@
   return state == IN_COMPONENT_STARTED_ALPHA;
 }
 
 std::string GetDirectoryListingEntry(const string16& name,
                                      const std::string& raw_bytes,
                                      bool is_dir,
                                      int64 size,
                                      Time modified) {
   std::string result;
   result.append("<script>addRow(");
-  string_escape::JsonDoubleQuote(name, true, &result);
+  base::JsonDoubleQuote(name, true, &result);
   result.append(",");
   if (raw_bytes.empty()) {
-    string_escape::JsonDoubleQuote(EscapePath(UTF16ToUTF8(name)),
+    base::JsonDoubleQuote(EscapePath(UTF16ToUTF8(name)),
                                    true, &result);
   } else {
-    string_escape::JsonDoubleQuote(EscapePath(raw_bytes), true, &result);
+    base::JsonDoubleQuote(EscapePath(raw_bytes), true, &result);
   }
   if (is_dir) {
     result.append(",1,");
   } else {
     result.append(",0,");
   }
 
-  string_escape::JsonDoubleQuote(
+  base::JsonDoubleQuote(
       WideToUTF16Hack(FormatBytes(size, GetByteDisplayUnits(size), true)), true,
       &result);
 
   result.append(",");
 
   string16 modified_str;
   // |modified| can be NULL in FTP listings.
   if (!modified.is_null()) {
     modified_str = WideToUTF16Hack(base::TimeFormatShortDateAndTime(modified));
   }
-  string_escape::JsonDoubleQuote(modified_str, true, &result);
+  base::JsonDoubleQuote(modified_str, true, &result);
 
   result.append(");</script>\n");
 
   return result;
 }
 
 std::wstring StripWWW(const std::wstring& text) {
   const std::wstring www(L"www.");
   return (text.compare(0, www.length(), www) == 0) ?
       text.substr(www.length()) : text;
@@ skipping 394 matching lines @@
       if (length > 0)
         ports.insert(StringToInt(WideToASCII(
             allowed_ports.substr(last, length))));
       last = i + 1;
     }
   }
   explicitly_allowed_ports = ports;
 }
 
 }  // namespace net