Pulling back revision 6635 and 6634 due to broken builds.

tools/browser_tester/browser_tester.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob
 import optparse
 import os.path
 import sys
 import thread
@@ skipping 191 matching lines @@
           err += '\nThe test probably did not get a callback that it expected.'
         listener.ServerError(err)
         break
       elif not options.interactive and HardTimeout(options.hard_timeout):
         listener.ServerError('The test took over %.1f seconds.  This is '
                              'probably a runaway test.' % options.hard_timeout)
         break
       else:
         # If Python 2.5 support is dropped, stick server.handle_request() here.
         time.sleep(0.125)
-
     if options.tool:
-      sys.stdout.write('##################### Waiting for the tool to exit\n')
       browser.WaitForProcessDeath()
-      sys.stdout.write('##################### Processing tool logs\n')
       tool_failed = ProcessToolLogs(options, browser.tool_log_dir)
-
   finally:
     browser.Cleanup()
     server.server_close()
 
   if tool_failed:
     return 2
   elif listener.ever_failed:
     return 1
   else:
     return 0
@@ skipping 13 matching lines @@
     parser.error('Must specify a URL')
 
   if options.hard_timeout is None:
     options.hard_timeout = options.timeout * 3
 
   return Run(url, options)
 
 
 if __name__ == '__main__':
   sys.exit(RunFromCommandLine())