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

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
Index: net/test/test_server.cc
===================================================================
--- net/test/test_server.cc (revision 109675)
+++ 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);
+ }
dmichael (off chromium) 2011/11/11 23:20:18 seems fine to my ignorant eye, but you'll need pha
Paweł Hajdan Jr. 2011/11/14 12:31:06 Thanks. I'm not a fan of magic like this. Could yo
noelallen1 2011/11/14 22:28:17 I don't agree. It makes sense that "Append" throw
Paweł Hajdan Jr. 2011/11/15 20:02:15 Sorry, I don't know what error this refers to. I t
rvargas (doing something else) 2011/11/15 23:50:21 I'm sorry, I only read these comments after my pre
Paweł Hajdan Jr. 2011/11/16 08:57:18 Thanks. By the way, I'm annoyed this change was co
certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net"))
.Append(FILE_PATH_LITERAL("data"))

Powered by Google App Engine
This is Rietveld 408576698