Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests.

tools/perf/benchmarks/chrome_proxy.py

Index: tools/perf/benchmarks/chrome_proxy.py
diff --git a/tools/perf/benchmarks/chrome_proxy.py b/tools/perf/benchmarks/chrome_proxy.py
deleted file mode 100644
index 9fa3ebe0c3a459bc3f402da9c58ae675228c9c8b..0000000000000000000000000000000000000000
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from measurements import chrome_proxy
-import page_sets
-from telemetry import benchmark
-
-
-@benchmark.Disabled
-class ChromeProxyLatency(benchmark.Benchmark):
-  tag = 'latency'
-  test = chrome_proxy.ChromeProxyLatency
-  page_set = page_sets.Top20PageSet
-  options = {'pageset_repeat_iters': 2}
-
-  def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
-
-
-@benchmark.Disabled
-class ChromeProxyLatencyDirect(benchmark.Benchmark):
-  tag = 'latency_direct'
-  test = chrome_proxy.ChromeProxyLatency
-  page_set = page_sets.Top20PageSet
-  options = {'pageset_repeat_iters': 2}
-
-
-@benchmark.Disabled
-class ChromeProxyLatencySynthetic(ChromeProxyLatency):
-  page_set = page_sets.SyntheticPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
-  page_set = page_sets.SyntheticPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyDataSaving(benchmark.Benchmark):
-  tag = 'data_saving'
-  test = chrome_proxy.ChromeProxyDataSaving
-  page_set = page_sets.Top20PageSet
-  options = {'pageset_repeat_iters': 1}
-  def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
-
-
-@benchmark.Disabled
-class ChromeProxyDataSavingDirect(benchmark.Benchmark):
-  tag = 'data_saving_direct'
-  test = chrome_proxy.ChromeProxyDataSaving
-  page_set = page_sets.Top20PageSet
-  options = {'pageset_repeat_iters': 2}
-
-
-@benchmark.Disabled
-class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
-  page_set = page_sets.SyntheticPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
-  page_set = page_sets.SyntheticPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyHeaderValidation(benchmark.Benchmark):
-  tag = 'header_validation'
-  test = chrome_proxy.ChromeProxyHeaders
-  page_set = page_sets.Top20PageSet
-
-
-@benchmark.Disabled
-class ChromeProxyBypass(benchmark.Benchmark):
-  tag = 'bypass'
-  test = chrome_proxy.ChromeProxyBypass
-  page_set = page_sets.BypassPageSet
-
-
-@benchmark.Disabled
-class ChromeProxySafeBrowsing(benchmark.Benchmark):
-  tag = 'safebrowsing'
-  test = chrome_proxy.ChromeProxySafebrowsing
-  page_set = page_sets.SafebrowsingPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyHTTPFallbackProbeURL(benchmark.Benchmark):
-  tag = 'fallback-probe'
-  test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
-  page_set = page_sets.SyntheticPageSet
-
-
-@benchmark.Disabled
-class ChromeProxyHTTPFallbackViaHeader(benchmark.Benchmark):
-  tag = 'fallback-viaheader'
-  test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
-  page_set = page_sets.FallbackViaHeaderPageSet
-
-
-@benchmark.Disabled
-class ChromeProxySmoke(benchmark.Benchmark):
-  tag = 'smoke'
-  test = chrome_proxy.ChromeProxySmoke
-  page_set = page_sets.SmokePageSet