diff options
| author | mtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 14:04:37 +0000 |
|---|---|---|
| committer | mtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 14:04:37 +0000 |
| commit | 8f0173231670e57f2ba57bba6fcb9d9591f80f00 (patch) | |
| tree | 665871846abb61e5963c72d222b816f243acfaee /net/test | |
| parent | 8646929a913b77438bf58e48e672ea68492d3ac1 (diff) | |
| download | chromium_src-8f0173231670e57f2ba57bba6fcb9d9591f80f00.zip chromium_src-8f0173231670e57f2ba57bba6fcb9d9591f80f00.tar.gz chromium_src-8f0173231670e57f2ba57bba6fcb9d9591f80f00.tar.bz2 | |
Remove support for gdata from the Python test server and net/test.
Drive related classes' tests do not use the python http test server anymore. Therefore, support for it is removed in this patch.
BUG=164071
Review URL: https://chromiumcodereview.appspot.com/11554018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/base_test_server.cc | 2 | ||||
| -rw-r--r-- | net/test/base_test_server.h | 4 | ||||
| -rw-r--r-- | net/test/local_test_server.cc | 4 | ||||
| -rw-r--r-- | net/test/remote_test_server.cc | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/net/test/base_test_server.cc b/net/test/base_test_server.cc index 9307acf..0e6b176 100644 --- a/net/test/base_test_server.cc +++ b/net/test/base_test_server.cc @@ -112,7 +112,6 @@ std::string BaseTestServer::SSLOptions::GetOCSPArgument() const { } const char BaseTestServer::kLocalhost[] = "127.0.0.1"; -const char BaseTestServer::kGDataAuthToken[] = "testtoken"; BaseTestServer::BaseTestServer(Type type, const std::string& host) : type_(type), @@ -147,7 +146,6 @@ std::string BaseTestServer::GetScheme() const { switch (type_) { case TYPE_FTP: return "ftp"; - case TYPE_GDATA: case TYPE_HTTP: case TYPE_SYNC: return "http"; diff --git a/net/test/base_test_server.h b/net/test/base_test_server.h index d343f18..041faf5 100644 --- a/net/test/base_test_server.h +++ b/net/test/base_test_server.h @@ -35,7 +35,6 @@ class BaseTestServer { enum Type { TYPE_BASIC_AUTH_PROXY, TYPE_FTP, - TYPE_GDATA, TYPE_HTTP, TYPE_HTTPS, TYPE_WS, @@ -150,9 +149,6 @@ class BaseTestServer { // Pass as the 'host' parameter during construction to server on 127.0.0.1 static const char kLocalhost[]; - // The auth token to be used for TYPE_GDATA server. - static const char kGDataAuthToken[]; - // Initialize a TestServer listening on a specific host (IP or hostname). BaseTestServer(Type type, const std::string& host); diff --git a/net/test/local_test_server.cc b/net/test/local_test_server.cc index 53879df..5e1e0e9 100644 --- a/net/test/local_test_server.cc +++ b/net/test/local_test_server.cc @@ -258,10 +258,6 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const { case TYPE_BASIC_AUTH_PROXY: command_line->AppendArg("--basic-auth-proxy"); break; - case TYPE_GDATA: - command_line->AppendArg( - std::string("--auth-token") + "=" + BaseTestServer::kGDataAuthToken); - break; default: NOTREACHED(); return false; diff --git a/net/test/remote_test_server.cc b/net/test/remote_test_server.cc index 45da5a5..3782cf2 100644 --- a/net/test/remote_test_server.cc +++ b/net/test/remote_test_server.cc @@ -46,7 +46,6 @@ std::string GetServerTypeString(BaseTestServer::Type type) { switch (type) { case BaseTestServer::TYPE_FTP: return "ftp"; - case BaseTestServer::TYPE_GDATA: case BaseTestServer::TYPE_HTTP: case BaseTestServer::TYPE_HTTPS: return "http"; |