Revert of Modifications to layout test framework so that it can work with browser_tests.

Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 # Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 31 matching lines @@
 from webkitpy.layout_tests.views import printing
 
 
 _log = logging.getLogger(__name__)
 
 
 
 def main(argv, stdout, stderr):
     options, args = parse_args(argv)
 
-    if options.platform and 'test' in options.platform and not 'browser_test' in options.platform:
+    if options.platform and 'test' in options.platform:
         # It's a bit lame to import mocks into real code, but this allows the user
         # to run tests against the test platform interactively, which is useful for
         # debugging test failures.
         from webkitpy.common.host_mock import MockHost
         host = MockHost()
     else:
         host = Host()
 
     if options.lint_test_files:
         from webkitpy.layout_tests.lint_test_expectations import run_checks
@@ skipping 308 matching lines @@
         printer.print_config(port.results_directory())
 
         run_details = manager.run(args)
         _log.debug("Testing completed, Exit status: %d" % run_details.exit_code)
         return run_details
     finally:
         printer.cleanup()
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr))