Re-organize Skia recipes

infra/bots/recipes/swarm_housekeeper.py

Index: infra/bots/recipes/swarm_housekeeper.py
diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py
index bf9cabbbf98d05035fcdd44599ddc3fecb371cc7..31d9c452974ca6e9f8261ea063cd7a12649e85ac 100644
--- a/infra/bots/recipes/swarm_housekeeper.py
+++ b/infra/bots/recipes/swarm_housekeeper.py
@@ -10,8 +10,10 @@ DEPS = [
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
-  'skia',
   'recipe_engine/step',
+  'skia',
+  'run',
+  'vars',
 ]
 
 
@@ -31,7 +33,7 @@ def RunSteps(api):
 
   cwd = api.path['checkout']
 
-  api.skia.run(
+  api.run(
     api.step,
     'android platform self-tests',
     cmd=['python',
@@ -43,8 +45,8 @@ def RunSteps(api):
 
   gsutil_path = api.path['depot_tools'].join('third_party', 'gsutil',
                                              'gsutil')
-  if not api.skia.is_trybot:
-    api.skia.run(
+  if not api.vars.is_trybot:
+    api.run(
       api.step,
       'generate and upload doxygen',
       cmd=['python', api.skia.resource('generate_and_upload_doxygen.py'),
@@ -53,12 +55,13 @@ def RunSteps(api):
       abort_on_failure=False)
 
   cmd = ['python', api.skia.resource('run_binary_size_analysis.py'),
-         '--library', api.skia.skia_out.join('Release', 'lib', 'libskia.so'),
+         '--library', api.vars.skia_out.join(
+             'Release', 'lib', 'libskia.so'),
          '--githash', api.properties['revision'],
          '--gsutil_path', gsutil_path]
-  if api.skia.is_trybot:
-    cmd.extend(['--issue_number', str(api.skia.m.properties['issue'])])
-  api.skia.run(
+  if api.vars.is_trybot:
+    cmd.extend(['--issue_number', str(api.properties['issue'])])
+  api.run(
     api.step,
     'generate and upload binary size data',
     cmd=cmd,
@@ -82,4 +85,6 @@ def GenTests(api):
         )
         if 'Trybot' in buildername:
           test.properties['issue'] = '500'
+          test.properties['patchset'] = '1'
+          test.properties['rietveld'] = 'https://codereview.chromium.org'
         yield test