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

chrome/common/sandbox_mac.mm

 // 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 "chrome/common/sandbox_mac.h"
 
 #include "base/debug_util.h"
 
 #import <Cocoa/Cocoa.h>
 extern "C" {
 #include <sandbox.h>
 }
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/json/string_escape.h"
 #include "base/mac_util.h"
 #include "base/scoped_cftyperef.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/string16.h"
-#include "base/string_escape.h"
 #include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace sandbox {
 
 // Warm up System APIs that empirically need to be accessed before the Sandbox
 // is turned on.
 // This method is layed out in blocks, each one containing a separate function
 // that needs to be warmed up. The OS version on which we found the need to
@@ skipping 87 matching lines @@
         stringByReplacingOccurrencesOfString:@";10.6_ONLY"
                                   withString:@""];
     // Splice the path of the user's home directory into the sandbox profile
     // (see renderer.sb for details).
     // This code is in the 10.6-only block because the sandbox syntax we use
     // for this "subdir" is only supported on 10.6.
     // If we ever need this on pre-10.6 OSs then we'll have to rethink the
     // surrounding sandbox syntax.
     string16 home_dir = base::SysNSStringToUTF16(NSHomeDirectory());
     std::string home_dir_escaped;
-    string_escape::JsonDoubleQuote(home_dir, false, &home_dir_escaped);
+    base::JsonDoubleQuote(home_dir, false, &home_dir_escaped);
     NSString* home_dir_escaped_ns = base::SysUTF8ToNSString(home_dir_escaped);
     sandbox_data = [sandbox_data
         stringByReplacingOccurrencesOfString:@"USER_HOMEDIR"
                                   withString:home_dir_escaped_ns];
   }
 
   char* error_buff = NULL;
   int error = sandbox_init([sandbox_data UTF8String], 0, &error_buff);
   bool success = (error == 0 && error_buff == NULL);
   if (error == -1) {
     LOG(ERROR) << "Failed to Initialize Sandbox: " << error_buff;
   }
   sandbox_free_error(error_buff);
   return success;
 }
 
 }  // namespace sandbox