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

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

 # 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.
 
 import base64
 import logging
 import urlparse
 
-from metrics import chrome_proxy
+from integration_tests import chrome_proxy_metrics as metrics
 from metrics import loading
 from telemetry.core import util
 from telemetry.page import page_measurement
 
 
 class ChromeProxyLatency(page_measurement.PageMeasurement):
   """Chrome proxy latency measurement."""
 
   def __init__(self, *args, **kwargs):
     super(ChromeProxyLatency, self).__init__(*args, **kwargs)
 
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
 
   def MeasurePage(self, page, tab, results):
     # Wait for the load event.
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
     loading.LoadingMetric().AddResults(tab, results)
 
 
 class ChromeProxyDataSaving(page_measurement.PageMeasurement):
   """Chrome proxy data daving measurement."""
   def __init__(self, *args, **kwargs):
     super(ChromeProxyDataSaving, self).__init__(*args, **kwargs)
-    self._metrics = chrome_proxy.ChromeProxyMetric()
+    self._metrics = metrics.ChromeProxyMetric()
 
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
     self._metrics.Start(page, tab)
 
   def MeasurePage(self, page, tab, results):
     # Wait for the load event.
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
     self._metrics.Stop(page, tab)
     self._metrics.AddResultsForDataSaving(tab, results)
 
 
 class ChromeProxyValidation(page_measurement.PageMeasurement):
   """Base class for all chrome proxy correctness measurements."""
 
   def __init__(self, restart_after_each_page=False):
     super(ChromeProxyValidation, self).__init__(
         needs_browser_restart_after_each_page=restart_after_each_page)
-    self._metrics = chrome_proxy.ChromeProxyMetric()
+    self._metrics = metrics.ChromeProxyMetric()
     self._page = None
     # Whether a timeout exception is expected during the test.
     self._expect_timeout = False
 
   def CustomizeBrowserOptions(self, options):
     # Enable the chrome proxy (data reduction proxy).
     options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
 
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
@@ skipping 179 matching lines @@
             ],
         'bypass': [self._metrics.AddResultsForBypass],
         'safebrowsing': [self._metrics.AddResultsForSafebrowsing],
         }
     if not self._page.name in page_to_metrics:
       raise page_measurement.MeasurementFailure(
           'Invalid page name (%s) in smoke. Page name must be one of:\n%s' % (
           self._page.name, page_to_metrics.keys()))
     for add_result in page_to_metrics[self._page.name]:
       add_result(tab, results)