Fix infra and infra_internal fetch recipes.

expect_tests and testing_support are now pulled in via DEPS.

R=cmp@chromium.org, pgervais@chromium.org
BUG=

Review URL: https://codereview.chromium.org/901083003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293963 0039d316-1c4b-4281-b951-d872f2087c98

recipes/infra.py

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

recipes/infra_internal.py

@@ -25,18 +25,6 @@ class InfraInternal(recipe_util.Recipe):
           'deps_file': '.DEPS.git',
           'managed': False
         },
-        {
-          'name': 'testing/expect_tests',
-          'url': url('chromium', 'infra/testing/expect_tests'),
-          'deps_file': '.DEPS.git',
-          'managed': False
-        },
-        {
-          'name': 'testing/testing_support',
-          'url': url('chromium', 'infra/testing/testing_support'),
-          'deps_file': '.DEPS.git',
-          'managed': False
-        },
       ],
     }
     return {