Integration tests for desktop platforms and safebrowsing

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

Index: tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
index 555035686b43863eba882f994f8c8b522b65a8d9..ebe7691e3aa3b184121203f155cb3220e0175594 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
@@ -139,19 +139,31 @@ class ChromeProxyBlockOnce(ChromeProxyValidation):
     self._metrics.AddResultsForBlockOnce(tab, results)
 
 
-class ChromeProxySafebrowsing(ChromeProxyValidation):
+class ChromeProxySafebrowsingMobile(ChromeProxyValidation):
   """Correctness measurement for safebrowsing."""
 
   def __init__(self):
-    super(ChromeProxySafebrowsing, self).__init__()
+    super(ChromeProxySafebrowsingMobile, self).__init__()
 
   def WillNavigateToPage(self, page, tab):
-    super(ChromeProxySafebrowsing, self).WillNavigateToPage(page, tab)
+    super(ChromeProxySafebrowsingMobile, self).WillNavigateToPage(page, tab)
     self._expect_timeout = True
 
   def AddResults(self, tab, results):
-    self._metrics.AddResultsForSafebrowsing(tab, results)
+    self._metrics.AddResultsForSafebrowsingMobile(tab, results)
 
+class ChromeProxySafebrowsingDesktop(ChromeProxyValidation):
+  """Correctness measurement for safebrowsing."""
+
+  def __init__(self):
+    super(ChromeProxySafebrowsingDesktop, self).__init__()
+
+  def WillNavigateToPage(self, page, tab):
+    super(ChromeProxySafebrowsingDesktop, self).WillNavigateToPage(page, tab)
+    self._expect_timeout = True
+
+  def AddResults(self, tab, results):
+    self._metrics.AddResultsForSafebrowsingDesktop(tab, results)
 
 _FAKE_PROXY_AUTH_VALUE = 'aabbccdd3b7579186c1b0620614fdb1f0000ffff'
 _TEST_SERVER = 'chromeproxy-test.appspot.com'
@@ -369,7 +381,7 @@ class ChromeProxySmoke(ChromeProxyValidation):
 
   def WillNavigateToPage(self, page, tab):
     super(ChromeProxySmoke, self).WillNavigateToPage(page, tab)
-    if page.name == 'safebrowsing':
+    if page.name == 'safebrowsingmobile':

[sclittle, 2014/12/29 18:51:35]

You should remove this if statement if you're removing safebrowsing from the
smoke test.

[Not at Google. Contact bengr, 2015/01/22 21:27:16]

Done.

       self._expect_timeout = True
 
   def AddResults(self, tab, results):
@@ -389,7 +401,6 @@ class ChromeProxySmoke(ChromeProxyValidation):
             self._metrics.AddResultsForDataSaving,
             ],
         'bypass': [self._metrics.AddResultsForBypass],
-        'safebrowsing': [self._metrics.AddResultsForSafebrowsing],
         }
     if not self._page.name in page_to_metrics:
       raise page_test.MeasurementFailure(