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

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 12210088: Make the TestServer use an absolute document root path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testserver uses absolute docroot path Created 7 years, 10 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: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index ad82fad0ecdc0130c9388b282f0462fdc6ada1b7..2195b3e361d9ccd97822e29786feacb9ba5ecdee 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -54,9 +54,6 @@ using content::NavigationEntry;
using content::SSLStatus;
using content::WebContents;
-const base::FilePath::CharType kDocRoot[] =
- FILE_PATH_LITERAL("chrome/test/data");
-
namespace {
class ProvisionalLoadWaiter : public content::WebContentsObserver {
@@ -96,16 +93,17 @@ class SSLUITest : public InProcessBrowserTest {
SSLUITest()
: https_server_(net::TestServer::TYPE_HTTPS,
SSLOptions(SSLOptions::CERT_OK),
- base::FilePath(kDocRoot)),
+ net::TestServer::GetTestDataPath()),
https_server_expired_(net::TestServer::TYPE_HTTPS,
SSLOptions(SSLOptions::CERT_EXPIRED),
- base::FilePath(kDocRoot)),
+ net::TestServer::GetTestDataPath()),
https_server_mismatched_(net::TestServer::TYPE_HTTPS,
SSLOptions(SSLOptions::CERT_MISMATCHED_NAME),
- base::FilePath(kDocRoot)),
+ net::TestServer::GetTestDataPath()),
wss_server_expired_(net::TestServer::TYPE_WSS,
SSLOptions(SSLOptions::CERT_EXPIRED),
- net::GetWebSocketTestDataDirectory()) {}
+ net::TestServer::GetSourceRelativePath(
+ net::GetWebSocketTestDataDirectory())) {}
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
// Browser will both run and display insecure content.

Powered by Google App Engine
This is Rietveld 408576698