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

5 files changed, 0 insertions, 73 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";
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index eefc448..139724c 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -19,7 +19,6 @@ import BaseHTTPServer
 import cgi
 import errno
 import hashlib
-import httplib
 import json
 import logging
 import minica
@@ -457,8 +456,6 @@ class TestPageHandler(BasePageHandler):
       self.EchoHeaderCache,
       self.EchoAllHandler,
       self.ZipFileHandler,
-      self.GDataAuthHandler,
-      self.GDataDocumentsFeedQueryHandler,
       self.FileHandler,
       self.SetCookieHandler,
       self.SetManyCookiesHandler,
@@ -1310,61 +1307,6 @@ class TestPageHandler(BasePageHandler):
     self.protocol_version = old_protocol_version
     return True
 
-  def GDataAuthHandler(self):
-    """This handler verifies the Authentication header for GData requests."""
-
-    if not self.server.gdata_auth_token:
-      # --auth-token is not specified, not the test case for GData.
-      return False
-
-    if not self._ShouldHandleRequest('/files/chromeos/gdata'):
-      return False
-
-    if 'GData-Version' not in self.headers:
-      self.send_error(httplib.BAD_REQUEST, 'GData-Version header is missing.')
-      return True
-
-    if 'Authorization' not in self.headers:
-      self.send_error(httplib.UNAUTHORIZED)
-      return True
-
-    field_prefix = 'Bearer '
-    authorization = self.headers['Authorization']
-    if not authorization.startswith(field_prefix):
-      self.send_error(httplib.UNAUTHORIZED)
-      return True
-
-    code = authorization[len(field_prefix):]
-    if code != self.server.gdata_auth_token:
-      self.send_error(httplib.UNAUTHORIZED)
-      return True
-
-    return False
-
-  def GDataDocumentsFeedQueryHandler(self):
-    """This handler verifies if required parameters are properly
-    specified for the GData DocumentsFeed request."""
-
-    if not self.server.gdata_auth_token:
-      # --auth-token is not specified, not the test case for GData.
-      return False
-
-    if not self._ShouldHandleRequest('/files/chromeos/gdata/root_feed.json'):
-      return False
-
-    (_path, _question, query_params) = self.path.partition('?')
-    self.query_params = urlparse.parse_qs(query_params)
-
-    if 'v' not in self.query_params:
-      self.send_error(httplib.BAD_REQUEST, 'v is not specified.')
-      return True
-    elif 'alt' not in self.query_params or self.query_params['alt'] != ['json']:
-      # currently our GData client only uses JSON format.
-      self.send_error(httplib.BAD_REQUEST, 'alt parameter is wrong.')
-      return True
-
-    return False
-
   def GetNonce(self, force_reset=False):
     """Returns a nonce that's stable per request path for the server's lifetime.
     This is a fake implementation. A real implementation would only use a given
@@ -2308,7 +2250,6 @@ class ServerRunner(testserver_base.TestServerRunner):
       server_data['port'] = server.server_port
       server._device_management_handler = None
       server.policy_keys = self.options.policy_keys
-      server.gdata_auth_token = self.options.auth_token
     elif self.options.server_type == SERVER_WEBSOCKET:
       # Launch pywebsocket via WebSocketServer.
       logger = logging.getLogger()
@@ -2490,9 +2431,6 @@ class ServerRunner(testserver_base.TestServerRunner):
                                   'round-robin fashion. The server will '
                                   'generate a random key if none is specified '
                                   'on the command line.')
-    self.option_parser.add_option('--auth-token', dest='auth_token',
-                                  help='Specify the auth token which should be '
-                                  'used in the authorization header for GData.')
 
 
 if __name__ == '__main__':