Fix infra and infra_internal fetch recipes.

recipes/infra.py

Index: recipes/infra.py
diff --git a/recipes/infra.py b/recipes/infra.py
index 3c65b4420f78aaef05421dfd187a64fbe50e7863..f9698a6d1d520583c496ef87957c528b72f990d4 100644
--- a/recipes/infra.py
+++ b/recipes/infra.py
@@ -14,24 +14,18 @@ class Infra(recipe_util.Recipe):
 
   @staticmethod
   def fetch_spec(_props):
-    solution = lambda name, path_infix = None: {
-      'name'     : name,
-      'url'      : 'https://chromium.googlesource.com/infra/%s%s.git' % (
-        path_infix + '/' if path_infix else '', name
-      ),
-      'deps_file': '.DEPS.git',
-      'managed'  : False,
-    }
-    spec = {
+    return {
+      'type': 'gclient_git',
+      'gclient_git_spec': {
         'solutions': [
-          solution('infra'),
-          solution('expect_tests', 'testing'),
-          solution('testing_support', 'testing'),
+          {
+            'name'     : 'infra',
+            'url'      : 'https://chromium.googlesource.com/infra/infra.git',
+            'deps_file': '.DEPS.git',
+            'managed'  : False,
+          }
         ],
-    }
-    return {
-        'type': 'gclient_git',
-        'gclient_git_spec': spec,
+      },
     }
 
   @staticmethod