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

base/json/string_escape.h

Index: base/json/string_escape.h
===================================================================
--- base/json/string_escape.h	(revision 0)
+++ base/json/string_escape.h	(working copy)
@@ -4,14 +4,14 @@
 //
 // This file defines utility functions for escaping strings.
 
-#ifndef BASE_STRING_ESCAPE_H__
-#define BASE_STRING_ESCAPE_H__
+#ifndef BASE_JSON_STRING_ESCAPE_H_
+#define BASE_JSON_STRING_ESCAPE_H_
 
 #include <string>
 
 #include "base/string16.h"
 
-namespace string_escape {
+namespace base {
 
 // Escape |str| appropriately for a JSON string litereal, _appending_ the
 // result to |dst|. This will create unicode escape sequences (\uXXXX).
@@ -27,6 +27,6 @@
                      std::string* dst);
 
 
-}  // namespace string_escape
+}  // namespace base
 
-#endif  // BASE_STRING_ESCAPE_H__
+#endif  // BASE_JSON_STRING_ESCAPE_H_
Property changes on: base/json/string_escape.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/string_escape.h:r69-2775