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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/test/test_server.cc

Issue 8539019: Test NaCl version of ppapi_tests via ui_tests (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | ppapi/native_client/tests/ppapi_tests/test_case.nmf » ('j') | ppapi/tests/test_url_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/test_server.cc
===================================================================
--- net/test/test_server.cc (revision 109649)
+++ net/test/test_server.cc (working copy)
@@ -274,7 +274,11 @@
FilePath src_dir;
PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
- document_root_ = src_dir.Append(document_root);
+ if (document_root.IsAbsolute()) {
+ document_root_ = document_root;
+ } else {
+ document_root_ = src_dir.Append(document_root);
+ }
certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net"))
.Append(FILE_PATH_LITERAL("data"))
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | ppapi/native_client/tests/ppapi_tests/test_case.nmf » ('j') | ppapi/tests/test_url_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698