Revert "Add CIPD package support to swarming recipe api"

scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
       "[SLAVE_BUILD]/swarming.client",
       "--url",
       "https://chromium.googlesource.com/external/swarming.client.git"
@@ skipping 68 matching lines @@
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "--version"
     ],
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_TEXT@0.8.6@@@"
+      "@@@STEP_TEXT@0.4.10@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/isolate.py",
       "archive",
       "--isolate",
       "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate",
@@ skipping 94 matching lines @@
       "--tag",
       "os:Windows-7-SP1",
       "--tag",
       "os:win",
       "--tag",
       "stepname:hello_world on Windows-7-SP1",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_win"
     ],
     "name": "[trigger] hello_world on Windows-7-SP1",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Windows-7-SP1/hash_for_w\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Windows-7-SP1/hash_for_w\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 50 matching lines @@
       "--tag",
       "os:Ubuntu-12.04",
       "--tag",
       "os:linux",
       "--tag",
       "stepname:hello_world on Ubuntu-12.04",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_linux"
     ],
     "name": "[trigger] hello_world on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Ubuntu-12.04/hash_for_l\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Ubuntu-12.04/hash_for_l:2:0\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 56 matching lines @@
       "--tag",
       "os:Mac-10.9",
       "--tag",
       "os:mac",
       "--tag",
       "stepname:hello_world on Mac-10.9",
       "--verbose",
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_mac"
     ],
     "name": "[trigger] hello_world on Mac-10.9",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hello_world/Mac-10.9/hash_for_m\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hello_world/Mac-10.9/hash_for_m\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 16 matching lines @@
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Windows-7-SP1/hash_for_w\", \"tasks\": {\"hello_world/Windows-7-SP1/hash_for_w\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
+      "--shards",
+      "1",
+      "hello_world/Windows-7-SP1/hash_for_w",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
       "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
     "name": "hello_world on Windows-7-SP1",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
@@ skipping 40 matching lines @@
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Ubuntu-12.04/hash_for_l\", \"tasks\": {\"hello_world/Ubuntu-12.04/hash_for_l:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}, \"hello_world/Ubuntu-12.04/hash_for_l:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10100\"}}}",
+      "--shards",
+      "2",
+      "hello_world/Ubuntu-12.04/hash_for_l",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
       "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
     "name": "hello_world on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
@@ skipping 74 matching lines @@
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm-dev.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Mac-10.9/hash_for_m\", \"tasks\": {\"hello_world/Mac-10.9/hash_for_m\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
+      "--shards",
+      "1",
+      "hello_world/Mac-10.9/hash_for_m",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
       "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir"
     ],
     "name": "hello_world on Mac-10.9",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
@@ skipping 54 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]