Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: content/test/test_content_client.cc

Issue 537063002: Eliminate silently letting errors pass on pak loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one last time Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/test_content_client.cc
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index 0ccc8cf5838c07d5861a0d8ff39181ee71571b18..3465032c3856e847ae7d862975285556aa627005 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
+#include "ui/base/ui_base_paths.h"
namespace content {
@@ -18,10 +19,7 @@ TestContentClient::TestContentClient()
#if !defined(OS_IOS)
base::FilePath content_shell_pack_path;
#if defined(OS_ANDROID)
- // 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"));
+ PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &content_shell_pack_path);
#else
PathService::Get(base::DIR_MODULE, &content_shell_pack_path);
#endif

Powered by Google App Engine
This is Rietveld 408576698