Revert of Eliminate silently letting errors pass on pak loading.

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 3465032c3856e847ae7d862975285556aa627005..0ccc8cf5838c07d5861a0d8ff39181ee71571b18 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -9,7 +9,6 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
-#include "ui/base/ui_base_paths.h"
 
 namespace content {
 
@@ -19,7 +18,10 @@
 #if !defined(OS_IOS)
   base::FilePath content_shell_pack_path;
 #if defined(OS_ANDROID)
-  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &content_shell_pack_path);
+  // on Android all pak files are inside the paks folder.
+  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_shell_pack_path);
 #endif