diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 00:05:29 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 00:05:29 +0000 |
| commit | 4b187da774d9223d7f6261988aebee7799905719 (patch) | |
| tree | 4bb5e08a134a77962fcf67278961a6f954bfc30e /chrome/browser/net/proxy_browsertest.cc | |
| parent | eab6b0725d656ff1667508baca132ab17a5658db (diff) | |
| download | chromium_src-4b187da774d9223d7f6261988aebee7799905719.zip chromium_src-4b187da774d9223d7f6261988aebee7799905719.tar.gz chromium_src-4b187da774d9223d7f6261988aebee7799905719.tar.bz2 | |
Add GetWebSocketTestDataDirectory() to test_data_directory
- add GetWebSocketTestDataDirectory() to provide test data directory
- use GetTestCertsDirectory() to specify certificates path
- use echo-with-no-extension_wsh.py instead of echo_wsh.py
BUG=157531
TBR=wtc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11270011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/proxy_browsertest.cc')
| -rw-r--r-- | chrome/browser/net/proxy_browsertest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index a555384..034ecd5 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -22,6 +22,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" +#include "net/base/test_data_directory.h" #include "net/test/test_server.h" namespace { @@ -87,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) { // Launch WebSocket server. net::TestServer ws_server(net::TestServer::TYPE_WS, net::TestServer::kLocalhost, - FilePath(FILE_PATH_LITERAL("net/data/websocket"))); + net::GetWebSocketTestDataDirectory()); ASSERT_TRUE(ws_server.Start()); content::WebContents* tab = chrome::GetActiveWebContents(browser()); |