Load mac sandbox definitions from resources instead of the bundle.

Also, move all mac sandbox unittests to content

BUG=90443
TEST=content_unittests

Review URL: http://codereview.chromium.org/8589001

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

1 files changed, 19 insertions, 1 deletions

diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index e1d6d43..eeb1df3 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -4,10 +4,18 @@
 
 #include "content/test/test_content_client.h"
 
+#include "base/base_paths.h"
+#include "base/file_path.h"
 #include "base/logging.h"
+#include "base/path_service.h"
 #include "base/string_piece.h"
 
 TestContentClient::TestContentClient() {
+  FilePath content_resources_pack_path;
+  PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
+  content_resources_pack_path = content_resources_pack_path.Append(
+      FILE_PATH_LITERAL("content_resources.pak"));
+  data_pack_.Load(content_resources_pack_path);
 }
 
 TestContentClient::~TestContentClient() {
@@ -45,7 +53,9 @@ string16 TestContentClient::GetLocalizedString(int message_id) const {
 }
 
 base::StringPiece TestContentClient::GetDataResource(int resource_id) const {
-  return base::StringPiece();
+  base::StringPiece resource;
+  data_pack_.GetStringPiece(resource_id, &resource);
+  return resource;
 }
 
 #if defined(OS_WIN)
@@ -54,3 +64,11 @@ bool TestContentClient::SandboxPlugin(CommandLine* command_line,
   return false;
 }
 #endif
+
+#if defined(OS_MACOSX)
+bool TestContentClient::GetSandboxProfileForSandboxType(
+    int sandbox_type,
+    int* sandbox_profile_resource_id) const {
+  return false;
+}
+#endif