| Index: testing/buildbot/chromium.perf.json
 | 
| diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
 | 
| index ec70b5b04635220fc46b6bc75104bde162771f38..f3ad4cae7b0e0bea8e35beab8d78f3924776b87a 100644
 | 
| --- a/testing/buildbot/chromium.perf.json
 | 
| +++ b/testing/buildbot/chromium.perf.json
 | 
| @@ -1,10 +1,45 @@
 | 
|  {
 | 
| -  "Linux Perf (3)": {
 | 
| +  "Android MotoE Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| +        "name": "host_info",
 | 
| +        "script": "host_info.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
| +        "name": "gpu_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
| +        "name": "cc_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Android Nexus10 Perf": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "name": "host_info",
 | 
| +        "script": "host_info.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
| +        "name": "gpu_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests", "--test-launcher-print-test-stdio=always"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| @@ -15,14 +50,18 @@
 | 
|          "script": "host_info.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
|          "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| @@ -33,23 +72,33 @@
 | 
|          "script": "host_info.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
|          "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
|    "Android Nexus6 Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| +        "name": "host_info",
 | 
| +        "script": "host_info.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| @@ -60,104 +109,245 @@
 | 
|          "script": "host_info.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
|          "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
|    "Android Nexus9 Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| +        "name": "host_info",
 | 
| +        "script": "host_info.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "gpu_perftests"
 | 
| +        ],
 | 
|          "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Android Nexus10 Perf": {
 | 
| +  "Android One Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
|          "name": "host_info",
 | 
|          "script": "host_info.py"
 | 
| -      },
 | 
| -      {
 | 
| -        "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| -      },
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Linux Perf (3)": {
 | 
| +    "scripts": [
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Android One Perf": {
 | 
| +  "Mac 10.8 Perf (1)": {
 | 
|      "scripts": [
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "gpu_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
| +        "name": "gpu_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
|      ]
 | 
|    },
 | 
| -  "Android MotoE Perf": {
 | 
| +  "Mac 10.8 Perf (3)": {
 | 
|      "scripts": [
 | 
|        {
 | 
| -        "name": "host_info",
 | 
| -        "script": "host_info.py"
 | 
| +        "args": [
 | 
| +          "cc_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
| +        "name": "cc_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        },
 | 
|        {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Mac 10.9 Perf (1)": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "gpu_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
|          "name": "gpu_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["gpu_perftests"]
 | 
| -      },
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Mac 10.9 Perf (3)": {
 | 
| +    "scripts": [
 | 
|        {
 | 
| +        "args": [
 | 
| +          "cc_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
|          "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests"]
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Mac 10.8 Perf (1)": {
 | 
| +  "Win 7 ATI GPU Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| -	"name": "gpu_perftests",
 | 
| -	"script": "gtest_perf_test.py",
 | 
| -	"args": ["gpu_perftests", "--test-launcher-print-test-stdio=always"]
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Mac 10.8 Perf (3)": {
 | 
| +  "Win 7 Intel GPU Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| -        "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests", "--test-launcher-print-test-stdio=always"]
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Mac 10.9 Perf (1)": {
 | 
| +  "Win 7 Low-End Perf (2)": {
 | 
|      "scripts": [
 | 
|        {
 | 
| -	"name": "gpu_perftests",
 | 
| -	"script": "gtest_perf_test.py",
 | 
| -	"args": ["gpu_perftests", "--test-launcher-print-test-stdio=always"]
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Mac 10.9 Perf (3)": {
 | 
| +  "Win 7 Nvidia GPU Perf": {
 | 
|      "scripts": [
 | 
|        {
 | 
| -        "name": "cc_perftests",
 | 
| -        "script": "gtest_perf_test.py",
 | 
| -        "args": ["cc_perftests", "--test-launcher-print-test-stdio=always"]
 | 
| +        "args": [
 | 
| +          "angle_perftests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=DrawCallPerf*",
 | 
| +          "--test-launcher-jobs=1"
 | 
| +        ],
 | 
| +        "name": "angle_perftests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Win 7 Perf (3)": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Win 7 x64 Perf (2)": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Win 8 Perf (2)": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "performance_browser_tests",
 | 
| +          "--test-launcher-print-test-stdio=always",
 | 
| +          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
 | 
| +          "--test-launcher-jobs=1",
 | 
| +          "--enable-gpu"
 | 
| +        ],
 | 
| +        "name": "performance_browser_tests",
 | 
| +        "script": "gtest_perf_test.py"
 | 
|        }
 | 
|      ]
 | 
|    }
 | 
| 
 |