Remove the --no-http option to run-webkit-tests.

Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.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 763 matching lines @@
         self.assertTrue(passing_run(['--additional-platform-directory', '/tmp/../foo']))
         self.assertTrue(passing_run(['--additional-platform-directory', '/tmp/foo', '--additional-platform-directory', '/tmp/bar']))
         self.assertTrue(passing_run(['--additional-platform-directory', 'foo']))
 
     def test_additional_expectations(self):
         host = MockHost()
         host.filesystem.write_text_file('/tmp/overrides.txt', 'Bug(x) failures/unexpected/mismatch.html [ ImageOnlyFailure ]\n')
         self.assertTrue(passing_run(['--additional-expectations', '/tmp/overrides.txt', 'failures/unexpected/mismatch.html'],
                                     tests_included=True, host=host))
 
-    def test_no_http_and_force(self):
-        # See test_run_force, using --force raises an exception.
-        # FIXME: We would like to check the warnings generated.
-        self.assertRaises(ValueError, logging_run, ['--force', '--no-http'])
-
     @staticmethod
     def has_test_of_type(tests, type):
         return [test for test in tests if type in test]
 
-    def test_no_http_tests(self):
-        batch_tests_dryrun = get_tests_run(['LayoutTests/http', 'websocket/'])
-        self.assertTrue(RunTest.has_test_of_type(batch_tests_dryrun, 'http'))
-        self.assertTrue(RunTest.has_test_of_type(batch_tests_dryrun, 'websocket'))
-
-        batch_tests_run_no_http = get_tests_run(['--no-http', 'LayoutTests/http', 'websocket/'])
-        self.assertFalse(RunTest.has_test_of_type(batch_tests_run_no_http, 'http'))
-        self.assertFalse(RunTest.has_test_of_type(batch_tests_run_no_http, 'websocket'))
-
-        batch_tests_run_http = get_tests_run(['--http', 'LayoutTests/http', 'websocket/'])
-        self.assertTrue(RunTest.has_test_of_type(batch_tests_run_http, 'http'))
-        self.assertTrue(RunTest.has_test_of_type(batch_tests_run_http, 'websocket'))
-
     def test_platform_directories_ignored_when_searching_for_tests(self):
         tests_run = get_tests_run(['--platform', 'test-mac-leopard'])
         self.assertFalse('platform/test-mac-leopard/http/test.html' in tests_run)
         self.assertFalse('platform/test-win-win7/http/test.html' in tests_run)
 
     def test_platform_directories_not_searched_for_additional_tests(self):
         tests_run = get_tests_run(['--platform', 'test-mac-leopard', 'http'])
         self.assertFalse('platform/test-mac-leopard/http/test.html' in tests_run)
         self.assertFalse('platform/test-win-win7/http/test.html' in tests_run)
 
@@ skipping 174 matching lines @@
 
             run_webkit_tests.run = successful_run
             res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr)
             self.assertEqual(res, -1)
 
             run_webkit_tests.run = exception_raising_run
             res = run_webkit_tests.main([], stdout, stderr)
             self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS)
         finally:
             run_webkit_tests.run = orig_run_fn