Get rid of internal content includes for sandbox code from chrome.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10512016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140357 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 19 insertions, 11 deletions

diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc
index 53e949c..50e9b6d 100644
--- a/content/common/sandbox_policy.cc
+++ b/content/common/sandbox_policy.cc
@@ -844,4 +844,10 @@ bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
+base::ProcessHandle StartProcessWithAccess(
+    CommandLine* cmd_line,
+    const FilePath& exposed_dir) {
+  return sandbox::StartProcessWithAccess(cmd_line, exposed_dir);
+}
+
 }  // namespace content
diff --git a/content/common/sandbox_policy.h b/content/common/sandbox_policy.h
index 53e4c2f..7a2e673 100644
--- a/content/common/sandbox_policy.h
+++ b/content/common/sandbox_policy.h
@@ -17,17 +17,14 @@ namespace sandbox {
 class BrokerServices;
 class TargetServices;
 
-CONTENT_EXPORT bool InitBrokerServices(
-    sandbox::BrokerServices* broker_services);
+bool InitBrokerServices(sandbox::BrokerServices* broker_services);
 
-CONTENT_EXPORT bool InitTargetServices(
-    sandbox::TargetServices* target_services);
+bool InitTargetServices(sandbox::TargetServices* target_services);
 
 // Starts a sandboxed process with the given directory unsandboxed
 // and returns a handle to it.
-CONTENT_EXPORT base::ProcessHandle StartProcessWithAccess(
-    CommandLine* cmd_line,
-    const FilePath& exposed_dir);
+base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
+                                           const FilePath& exposed_dir);
 
 }  // namespace sandbox
 
diff --git a/content/public/common/sandbox_init.h b/content/public/common/sandbox_init.h
index a6dcccc..ffe3feb 100644
--- a/content/public/common/sandbox_init.h
+++ b/content/public/common/sandbox_init.h
@@ -11,13 +11,12 @@
 #include "content/common/content_export.h"
 #include "ipc/ipc_platform_file.h"
 
-#if defined(OS_WIN)
+class CommandLine;
+class FilePath;
+
 namespace sandbox {
 struct SandboxInterfaceInfo;
 }
-#elif defined(OS_MACOSX)
-class FilePath;
-#endif
 
 namespace content {
 
@@ -52,6 +51,12 @@ CONTENT_EXPORT bool BrokerDuplicateHandle(HANDLE source_handle,
 // false otherwise.
 CONTENT_EXPORT bool BrokerAddTargetPeer(HANDLE peer_process);
 
+// Starts a sandboxed process with the given directory unsandboxed
+// and returns a handle to it.
+CONTENT_EXPORT base::ProcessHandle StartProcessWithAccess(
+    CommandLine* cmd_line,
+    const FilePath& exposed_dir);
+
 #elif defined(OS_MACOSX)
 
 // Initialize the sandbox of the given |sandbox_type|, optionally specifying a