Upstream Android-specific net/ changes.

Upstream Android-specific net/ changes.

BUG=136750
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=163107

[newt (away), 2012-10-18 00:44:41]

PTAL

phajdan.jr: net/tools/testserver
yfriedman:  net/android
pastarmovj: net/

Thanks all!

[Yaron, 2012-10-18 01:51:16]

lgtm

[pastarmovj, 2012-10-18 08:18:53]

Unfortunately I am not an owner to stamp your CL. 
However only for the gyp change TBR-ing an owner should be fine especially
provided that the android people agree with your change. Or else just pick one
of the 15 owners listed in net/OWNERS :)

[newt (away), 2012-10-18 18:14:45]

+willchan for net and net/proxy changes.

Thanks!

[willchan no longer on Chromium, 2012-10-18 18:18:57]

lgtm

[Paweł Hajdan Jr., 2012-10-18 19:14:44]

http://codereview.chromium.org/11191047/diff/8001/net/tools/testserver/testse...
File net/tools/testserver/testserver.py (right):

http://codereview.chromium.org/11191047/diff/8001/net/tools/testserver/testse...
net/tools/testserver/testserver.py:2183: pass
Why don't we close our fds here like in __del__ ?

[newt (away), 2012-10-18 20:54:34]

http://codereview.chromium.org/11191047/diff/8001/net/tools/testserver/testse...
File net/tools/testserver/testserver.py (right):

http://codereview.chromium.org/11191047/diff/8001/net/tools/testserver/testse...
net/tools/testserver/testserver.py:2183: pass
On 2012/10/18 19:14:44, Paweł Hajdan Jr. wrote:
> Why don't we close our fds here like in __del__ ?

Done.

[Paweł Hajdan Jr., 2012-10-18 22:28:57]

LGTM

[commit-bot: I haz the power, 2012-10-19 00:00:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/11191047/12001

[commit-bot: I haz the power, 2012-10-19 01:29:12]

Retried try job too often for step(s) content_browsertests

[commit-bot: I haz the power, 2012-10-19 17:23:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/11191047/15001

[commit-bot: I haz the power, 2012-10-19 17:23:25]

Failed to apply patch for net/tools/testserver/testserver.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file net/tools/testserver/testserver.py
  Hunk #5 FAILED at 2264.
  Hunk #6 succeeded at 2313 (offset 18 lines).
  1 out of 6 hunks FAILED -- saving rejects to file
net/tools/testserver/testserver.py.rej

Patch:       net/tools/testserver/testserver.py
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py
b/net/tools/testserver/testserver.py
index
1cae65d226624f2de1d2d84f96feb35afa860013..812bd8eb8db4c197965fb3a8d1b3bcd11a7a1a97
100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -1970,7 +1970,7 @@ class SyncPageHandler(BasePageHandler):
     return True;
 
 
-def MakeDataDir():
+def MakeDataDir(options):
   if options.data_dir:
     if not os.path.isdir(options.data_dir):
       print 'specified data dir not found: ' + options.data_dir + ' exiting...'
@@ -2163,10 +2163,7 @@ class FileMultiplexer:
     self.__fd2 = fd2
 
   def __del__(self) :
-    if self.__fd1 != sys.stdout and self.__fd1 != sys.stderr:
-      self.__fd1.close()
-    if self.__fd2 != sys.stdout and self.__fd2 != sys.stderr:
-      self.__fd2.close()
+    self.close()
 
   def write(self, text) :
     self.__fd1.write(text)
@@ -2176,6 +2173,13 @@ class FileMultiplexer:
     self.__fd1.flush()
     self.__fd2.flush()
 
+  def close(self):
+    if self.__fd1 != sys.stdout and self.__fd1 != sys.stderr:
+      self.__fd1.close()
+    if self.__fd2 != sys.stdout and self.__fd2 != sys.stderr:
+      self.__fd2.close()
+
+
 def main(options, args):
   logfile = open('testserver.log', 'w')
   sys.stderr = FileMultiplexer(sys.stderr, logfile)
@@ -2247,7 +2251,7 @@ def main(options, args):
       server = HTTPServer((host, port), TestPageHandler)
       print 'HTTP server started on %s:%d...' % (host, server.server_port)
 
-    server.data_dir = MakeDataDir()
+    server.data_dir = MakeDataDir(options)
     server.file_root_url = options.file_root_url
     server_data['port'] = server.server_port
     server._device_management_handler = None
@@ -2260,7 +2264,7 @@ def main(options, args):
     logger.addHandler(logging.StreamHandler())
     # TODO(toyoshim): Remove following os.chdir. Currently this operation
     # is required to work correctly. It should be fixed from pywebsocket side.
-    os.chdir(MakeDataDir())
+    os.chdir(MakeDataDir(options))
     server = WebSocketServer(WebSocketOptions(host, port, '.'))
     print 'WebSocket server started on %s:%d...' % (host, server.server_port)
     server_data['port'] = server.server_port
@@ -2291,7 +2295,7 @@ def main(options, args):
     server_data['port'] = server.server_port
   # means FTP Server
   else:
-    my_data_dir = MakeDataDir()
+    my_data_dir = MakeDataDir(options)
 
     # Instantiate a dummy authorizer for managing 'virtual' users
     authorizer = pyftpdlib.ftpserver.DummyAuthorizer()

[commit-bot: I haz the power, 2012-10-19 18:17:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/11191047/17003

[commit-bot: I haz the power, 2012-10-19 19:16:46]

Sorry for I got bad news for ya.
Compile failed with a clobber build.
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-19 22:03:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/11191047/17003

[commit-bot: I haz the power, 2012-10-20 00:28:37]

Change committed as 163107