Move the user agent styles sheets to blink_resources.grd (Part 2) with Unit test support

content/test/test_content_client.cc

Index: content/test/test_content_client.cc
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index abd1aeadf7bfcae0f69ff5158750ef15c21ec8b6..b4053c62ac598db5eba01526ebcdeed96bad3aee 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -10,25 +10,30 @@
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 
+#if defined(OS_MACOSX)
+#include "content/shell/app/paths_mac.h"
+#endif
+
 namespace content {
 
 TestContentClient::TestContentClient()
     : data_pack_(ui::SCALE_FACTOR_100P) {
-  // content_resources.pak is not built on iOS as it is not required.
-#if !defined(OS_IOS)
-  base::FilePath content_resources_pack_path;
+  base::FilePath content_shell_pack_path;
+#if defined(OS_MACOSX)
+  content_shell_pack_path = GetResourcesPakFilePath();
+#else
 #if defined(OS_ANDROID)
   // on Android all pak files are inside the paks folder.
-  PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path);
-  content_resources_pack_path = content_resources_pack_path.Append(
+  PathService::Get(base::DIR_ANDROID_APP_DATA, &content_shell_pack_path);
+  content_shell_pack_path = content_shell_pack_path.Append(
       FILE_PATH_LITERAL("paks"));
 #else
-  PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
+  PathService::Get(base::DIR_MODULE, &content_shell_pack_path);
 #endif
-  content_resources_pack_path = content_resources_pack_path.Append(
-      FILE_PATH_LITERAL("content_resources.pak"));
-  data_pack_.LoadFromPath(content_resources_pack_path);
+  content_shell_pack_path = content_shell_pack_path.Append(
+      FILE_PATH_LITERAL("content_shell.pak"));
 #endif
+  data_pack_.LoadFromPath(content_shell_pack_path);
 }
 
 TestContentClient::~TestContentClient() {