Revert of Simplify import-w3c-tests: support exactly one argument.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
index 44ca2e0ae5b66e1aa88de2887d0e8e561b10070d..2551d9418429bd9568b6b9d41a8b25e65e0afe2f 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
@@ -35,7 +35,8 @@
 from webkitpy.w3c.test_importer import TestImporter
 
 
-FAKE_SOURCE_REPO_DIR = '/blink'
+FAKE_SOURCE_DIR = '/blink/w3c'
+FAKE_REPO_DIR = '/blink'
 
 FAKE_FILES = {'/mock-checkout/third_party/Webkit/LayoutTests/w3c/OWNERS': '',
               '/blink/w3c/dir/README.txt': '',
@@ -66,7 +67,7 @@
             "abort: no repository found in '/Volumes/Source/src/wk/Tools/Scripts/webkitpy/w3c'"))
         host.filesystem = MockFileSystem(files=FAKE_FILES)
 
-        importer = TestImporter(host, FAKE_SOURCE_REPO_DIR, self.options())
+        importer = TestImporter(host, FAKE_SOURCE_DIR, FAKE_REPO_DIR, self.options())
 
         oc = OutputCapture()
         oc.capture_output()
@@ -76,18 +77,18 @@
             oc.restore_output()
 
     def test_path_too_long_true(self):
-        importer = TestImporter(MockHost(), FAKE_SOURCE_REPO_DIR, self.options())
-        self.assertTrue(importer.path_too_long(FAKE_SOURCE_REPO_DIR + '/' + ('x' * 150) + '.html'))
+        importer = TestImporter(MockHost(), FAKE_SOURCE_DIR, FAKE_REPO_DIR, self.options())
+        self.assertTrue(importer.path_too_long(FAKE_REPO_DIR + '/' + ('x' * 150) + '.html'))
 
     def test_path_too_long_false(self):
-        importer = TestImporter(MockHost(), FAKE_SOURCE_REPO_DIR, self.options())
-        self.assertFalse(importer.path_too_long(FAKE_SOURCE_REPO_DIR + '/x.html'))
+        importer = TestImporter(MockHost(), FAKE_SOURCE_DIR, FAKE_REPO_DIR, self.options())
+        self.assertFalse(importer.path_too_long(FAKE_REPO_DIR + '/x.html'))
 
     def test_does_not_import_owner_files(self):
         host = MockHost()
         host.filesystem = MockFileSystem(files=FAKE_FILES)
-        importer = TestImporter(host, FAKE_SOURCE_REPO_DIR, self.options())
-        importer.find_importable_tests()
+        importer = TestImporter(host, FAKE_SOURCE_DIR, FAKE_REPO_DIR, self.options())
+        importer.find_importable_tests(FAKE_REPO_DIR)
         self.assertEqual(importer.import_list,
                          [{'copy_list': [{'dest': 'README.txt', 'src': '/blink/w3c/dir/README.txt'}],
                            'dirname': '/blink/w3c/dir',