diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 03:21:37 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-26 03:21:37 +0000 |
| commit | 95d6b36ee89809ab261ced025d57405f65adf8d0 (patch) | |
| tree | 1ed4adbb7e7a1fc2b238585b36238f7476848cc7 /net/test | |
| parent | 23ced42b6e81e851880c437cf36b79e4d183a040 (diff) | |
| download | chromium_src-95d6b36ee89809ab261ced025d57405f65adf8d0.zip chromium_src-95d6b36ee89809ab261ced025d57405f65adf8d0.tar.gz chromium_src-95d6b36ee89809ab261ced025d57405f65adf8d0.tar.bz2 | |
Revert 67428 - Added server_data json dictionary to testserver.py
This is split off from 5196001.
BUG=53934
TEST=manually
TBR=cbentzel
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/5279005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 1ae2c5b..0e8c461 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -278,11 +278,6 @@ bool TestServer::SetPythonPath() { } third_party_dir = third_party_dir.Append(FILE_PATH_LITERAL("third_party")); - // For simplejson. (simplejson, unlike all the other python modules - // we include, doesn't have an extra 'simplejson' directory, so we - // need to include its parent directory, i.e. third_party_dir). - AppendToPythonPath(third_party_dir); - AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite"))); AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib"))); |