Simplify cq url match rules and add http urls

tests/project_test.py

Index: tests/project_test.py
diff --git a/tests/project_test.py b/tests/project_test.py
index ab3517a700b4a2ca40aa27269be2a475f0727748..5b54fa33038521ee977c2cf08d96e6ee856408a2 100755
--- a/tests/project_test.py
+++ b/tests/project_test.py
@@ -205,22 +205,12 @@ class ProjectTest(TestCase):
               '^https\\:\\/\\/src\\.chromium\\.org\\/chrome/trunk/tools(|/.*)$',
 
               # git
-              '^http\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^http\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)' + branch,
-              '^http\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
-                  '\\/([a-z0-9\\-_]+)' + branch,
-              '^https\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
-                  '\\/([a-z0-9\\-_]+)\\.git' + branch,
+              '^https?\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
+                  '([a-z0-9\\-_]+)(?:\\.git)?' + branch,
+              '^https?\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
+                  '([a-z0-9\\-_]+)(?:\\.git)?' + branch,
+              '^https?\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
+                  '\\/([a-z0-9\\-_]+)(?:\\.git)?' + branch,
             ],
             project_bases_verifier.project_bases)
     self.assertEqual({}, mapping)