Remove the net-internals dependency from chrome proxy telemetry tests.

tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.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 unittest
 
 from integration_tests import chrome_proxy_metrics as metrics
 from integration_tests import network_metrics_unittest as network_unittest
 from metrics import test_page_test_results
@@ skipping 187 matching lines @@
     results.AssertHasPageSpecificScalarValue('bypass', 'count', 1)
 
   def testChromeProxyMetricForCorsBypass(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([EVENT_HTML_PROXY_DEPRECATED_VIA,
                       EVENT_IMAGE_BYPASS,
                       EVENT_IMAGE_DIRECT])
     results = test_page_test_results.TestPageTestResults(self)
     metric.AddResultsForCorsBypass(None, results)
     results.AssertHasPageSpecificScalarValue('cors_bypass', 'count', 1)
 

[bolian, 2015/01/14 07:01:04]

Also add test for the new funcs?  At least add a TODO?

[sclittle, 2015/01/14 19:20:51]

Sure, I've added new unit tests, except for ReenableAfterBypass since it's not
really testable.

-
-  def testChromeProxyMetricForHTTPFallback(self):
-    metric = metrics.ChromeProxyMetric()
-    metric.SetEvents([
-        EVENT_HTML_PROXY,
-        EVENT_HTML_PROXY_DEPRECATED_VIA])
-    results = test_page_test_results.TestPageTestResults(self)
-
-    fallback_exception = False
-    info = {}
-    info['enabled'] = False
-    self._StubGetProxyInfo(info)
-    try:
-      metric.AddResultsForBypass(None, results)
-    except metrics.ChromeProxyMetricException:
-      fallback_exception = True
-    self.assertTrue(fallback_exception)
-
-    fallback_exception = False
-    info['enabled'] = True
-    info['proxies'] = [
-        'something.else.com:80',
-        metrics.PROXY_SETTING_DIRECT
-        ]
-    self._StubGetProxyInfo(info)
-    try:
-      metric.AddResultsForBypass(None, results)
-    except metrics.ChromeProxyMetricException:
-      fallback_exception = True
-    self.assertTrue(fallback_exception)
-
-    info['enabled'] = True
-    info['proxies'] = [
-        metrics.PROXY_SETTING_HTTP,
-        metrics.PROXY_SETTING_DIRECT
-        ]
-    self._StubGetProxyInfo(info)
-    metric.AddResultsForHTTPFallback(None, results)
-
   def testChromeProxyMetricForSafebrowsing(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([EVENT_MALWARE_PROXY])
     results = test_page_test_results.TestPageTestResults(self)
 
     metric.AddResultsForSafebrowsing(None, results)
     results.AssertHasPageSpecificScalarValue('safebrowsing', 'boolean', True)
 
     # Clear results and metrics to test no response for safebrowsing
     results = test_page_test_results.TestPageTestResults(self)
     metric.SetEvents([])
     metric.AddResultsForSafebrowsing(None, results)
     results.AssertHasPageSpecificScalarValue('safebrowsing', 'boolean', True)