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

tools/chrome_proxy/integration_tests/chrome_proxy_metrics.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 datetime
 import logging
 import os
 
+from integration_tests import network_metrics
 from telemetry.page import page_measurement
-from metrics import network
 from telemetry.value import scalar
 
 
 class ChromeProxyMetricException(page_measurement.MeasurementFailure):
   pass
 
 
 CHROME_PROXY_VIA_HEADER = 'Chrome-Compression-Proxy'
 CHROME_PROXY_VIA_HEADER_DEPRECATED = '1.1 Chrome Compression Proxy'
 
 PROXY_SETTING_HTTPS = 'proxy.googlezip.net:443'
 PROXY_SETTING_HTTPS_WITH_SCHEME = 'https://' + PROXY_SETTING_HTTPS
 PROXY_SETTING_HTTP = 'compress.googlezip.net:80'
 PROXY_SETTING_DIRECT = 'direct://'
 
 # The default Chrome Proxy bypass time is a range from one to five mintues.
 # See ProxyList::UpdateRetryInfoOnFallback in net/proxy/proxy_list.cc.
 DEFAULT_BYPASS_MIN_SECONDS = 60
 DEFAULT_BYPASS_MAX_SECONDS = 5 * 60
 
 def GetProxyInfoFromNetworkInternals(tab, url='chrome://net-internals#proxy'):
   tab.Navigate(url)
-  with open(os.path.join(os.path.dirname(__file__), 'chrome_proxy.js')) as f:
+  with open(os.path.join(os.path.dirname(__file__),
+                         'chrome_proxy_metrics.js')) as f:
     js = f.read()
     tab.ExecuteJavaScript(js)
   tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
   info = tab.EvaluateJavaScript('window.__getChromeProxyInfo()')
   return info
 
 
 def ProxyRetryTimeInRange(retry_time, low, high, grace_seconds=30):
   return (retry_time >= low and
           (retry_time < high + datetime.timedelta(seconds=grace_seconds)))
 
 
-class ChromeProxyResponse(network.HTTPResponse):
+class ChromeProxyResponse(network_metrics.HTTPResponse):
   """ Represents an HTTP response from a timeleine event."""
   def __init__(self, event):
     super(ChromeProxyResponse, self).__init__(event)
 
   def ShouldHaveChromeProxyViaHeader(self):
     resp = self.response
     # Ignore https and data url
     if resp.url.startswith('https') or resp.url.startswith('data:'):
       return False
     # Ignore 304 Not Modified and cache hit.
@@ skipping 24 matching lines @@
 
   def IsSafebrowsingResponse(self):
     if (self.response.status == 307 and
         self.response.GetHeader('X-Malware-Url') == '1' and
         self.IsValidByViaHeader() and
         self.response.GetHeader('Location') == self.response.url):
       return True
     return False
 
 
-class ChromeProxyMetric(network.NetworkMetric):
+class ChromeProxyMetric(network_metrics.NetworkMetric):
   """A Chrome proxy timeline metric."""
 
   def __init__(self):
     super(ChromeProxyMetric, self).__init__()
     self.compute_data_saving = True
     self.effective_proxies = {
         "proxy": PROXY_SETTING_HTTPS_WITH_SCHEME,
         "fallback": PROXY_SETTING_HTTP,
         "direct": PROXY_SETTING_DIRECT,
         }
@@ skipping 161 matching lines @@
     bad_proxies = []
     if 'badProxies' in info and info['badProxies']:
       bad_proxies = [p['proxy'] for p in info['badProxies']
                      if 'proxy' in p and p['proxy']]
     if bad_proxies != expected_bad_proxies:
       raise ChromeProxyMetricException, (
           'Wrong bad proxies (%s). Expect: "%s"' % (
           str(bad_proxies), str(expected_bad_proxies)))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'http_fallback', 'boolean', True))