Replacing aws test pages with existing check.googlezip.net counterparts.

There are still three pages hosted on aws where we need to add an equivelant to googlezip before we can make the switch client side.  But this covers 9 of the 14 occurences we depend on aws for test pages.  The remaining pages are:

aws1.mdw.la/static
aws1.mdw.la/test/cors
aws1.mdw.la/exptest

BUG=489886

Review URL: https://codereview.chromium.org/1165893003

Cr-Commit-Position: refs/heads/master@{#332863}

16 files changed, 12 insertions, 65 deletions

diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
index 360367c..243c346 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
@@ -10,7 +10,6 @@ class BypassPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(BypassPage, self).__init__(url=url, page_set=page_set)
-    self.archive_data_file = '../data/chrome_proxy_bypass.json'
 
 
 class BypassPageSet(page_set_module.PageSet):
@@ -18,11 +17,10 @@ class BypassPageSet(page_set_module.PageSet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(BypassPageSet, self).__init__(
-      archive_data_file='../data/chrome_proxy_bypass.json')
+    super(BypassPageSet, self).__init__()
 
     urls_list = [
-      'http://aws1.mdw.la/bypass/',
+      'http://check.googlezip.net/block',
     ]
 
     for url in urls_list:
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
index bcd68b5..7350822 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
@@ -33,7 +33,7 @@ class ClientTypePageSet(page_set_module.PageSet):
     # of the following pages, since there's no way to get the client type value
     # from a request that was bypassed.
     self.AddUserStory(ClientTypePage(
-        url='http://aws1.mdw.la/fw',
+        url='http://check.googlezip.net/test.html',
         page_set=self,
         bypass_for_client_type='none'))
 
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
index 4fc42bc..c59eded 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
@@ -10,7 +10,6 @@ class CorsBypassPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(CorsBypassPage, self).__init__(url=url, page_set=page_set)
-    self.archive_data_file = '../data/chrome_proxy_bypass.json'
 
 
 class CorsBypassPageSet(page_set_module.PageSet):
@@ -18,8 +17,7 @@ class CorsBypassPageSet(page_set_module.PageSet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(CorsBypassPageSet, self).__init__(
-      archive_data_file='../data/chrome_proxy_bypass.json')
+    super(CorsBypassPageSet, self).__init__()
 
     urls_list = [
       'http://aws1.mdw.la/test/cors/',
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass.json b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass.json
deleted file mode 100644
index c423c2d..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
-    "archives": {
-        "chrome_proxy_bypass_000.wpr": [
-            "http://aws1.mdw.la/bypass/", 
-            "http://aws1.mdw.la/piatek/bypass-demo"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass_000.wpr.sha1 b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass_000.wpr.sha1
deleted file mode 100644
index b9a9f39..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_bypass_000.wpr.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff4418fccf62dd0f9ca0b738917d836964dde801
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing.json b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing.json
deleted file mode 100644
index 729ff78..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
-    "archives": {
-        "chrome_proxy_safebrowsing_000.wpr": [
-            "http://www.ianfette.org/"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing_000.wpr.sha1 b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing_000.wpr.sha1
deleted file mode 100644
index b9a9f39..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_safebrowsing_000.wpr.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff4418fccf62dd0f9ca0b738917d836964dde801
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke.json b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke.json
deleted file mode 100644
index 9bd0690..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
-    "archives": {
-        "chrome_proxy_smoke_000.wpr": [
-            "header validation", 
-            "compression: image", 
-            "bypass", 
-            "compression: javascript", 
-            "compression: css", 
-            "safebrowsing"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke_000.wpr.sha1 b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke_000.wpr.sha1
deleted file mode 100644
index b9a9f39..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_smoke_000.wpr.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff4418fccf62dd0f9ca0b738917d836964dde801
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic.json b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic.json
deleted file mode 100644
index af3151c..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
-    "archives": {
-        "chrome_proxy_synthetic_000.wpr": [
-            "http://aws1.mdw.la/fw", 
-            "http://aws1.mdw.la/static"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic_000.wpr.sha1 b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic_000.wpr.sha1
deleted file mode 100644
index b9a9f39..0000000
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/data/chrome_proxy_synthetic_000.wpr.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff4418fccf62dd0f9ca0b738917d836964dde801
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
index e33b287..8a105eb 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
@@ -19,7 +19,7 @@ class HTTPToDirectFallbackPageSet(page_set_module.PageSet):
 
     urls_list = [
       'http://check.googlezip.net/fallback',
-      'http://aws1.mdw.la/bypass',
+      'http://check.googlezip.net/block',
     ]
 
     for url in urls_list:
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
index 431098f..0fd578d 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
@@ -23,7 +23,7 @@ class LoFiPageSet(page_set_module.PageSet):
     super(LoFiPageSet, self).__init__()
 
     urls_list = [
-      'http://aws1.mdw.la/fw/buddy.jpg',
+      'http://check.googlezip.net/image.png',
     ]
 
     for url in urls_list:
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
index 219b65a..9047ae6 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
@@ -17,7 +17,6 @@ class SafebrowsingPage(page_module.Page):
 
   def __init__(self, url, page_set, expect_timeout):
     super(SafebrowsingPage, self).__init__(url=url, page_set=page_set)
-    self.archive_data_file = '../data/chrome_proxy_safebrowsing.json'
     self._expect_timeout = expect_timeout
 
   def RunNavigateSteps(self, action_runner):
@@ -35,8 +34,7 @@ class SafebrowsingPageSet(page_set_module.PageSet):
   """ Chrome proxy test sites """
 
   def __init__(self, expect_timeout=False):
-    super(SafebrowsingPageSet, self).__init__(
-      archive_data_file='../data/chrome_proxy_safebrowsing.json')
+    super(SafebrowsingPageSet, self).__init__()
 
     self.AddUserStory(
         SafebrowsingPage('http://www.ianfette.org/', self, expect_timeout))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
index 49de585..2e67591 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
@@ -10,7 +10,6 @@ class SmokePage(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
     super(SmokePage, self).__init__(url=url, page_set=page_set, name=name)
-    self.archive_data_file = '../data/chrome_proxy_smoke.json'
 
 
 class Page1(SmokePage):
@@ -21,7 +20,7 @@ class Page1(SmokePage):
 
   def __init__(self, page_set):
     super(Page1, self).__init__(
-      url='http://aws1.mdw.la/fw/',
+      url='http://check.googlezip.net/test.html',
       page_set=page_set,
       name='header validation')
 
@@ -47,7 +46,7 @@ class Page3(SmokePage):
 
   def __init__(self, page_set):
     super(Page3, self).__init__(
-      url='http://aws1.mdw.la/bypass/',
+      url='http://check.googlezip.net/block',
       page_set=page_set,
       name='bypass')
 
@@ -84,8 +83,7 @@ class SmokePageSet(page_set_module.PageSet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(SmokePageSet, self).__init__(
-      archive_data_file='../data/chrome_proxy_smoke.json')
+    super(SmokePageSet, self).__init__()
 
     self.AddUserStory(Page1(self))
     self.AddUserStory(Page2(self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
index e38da89..0b16909 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
@@ -10,7 +10,6 @@ class SyntheticPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(SyntheticPage, self).__init__(url=url, page_set=page_set)
-    self.archive_data_file = '../data/chrome_proxy_synthetic.json'
 
 
 class SyntheticPageSet(page_set_module.PageSet):
@@ -18,11 +17,10 @@ class SyntheticPageSet(page_set_module.PageSet):
   """ Chrome proxy synthetic test pages. """
 
   def __init__(self):
-    super(SyntheticPageSet, self).__init__(
-      archive_data_file='../data/chrome_proxy_synthetic.json')
+    super(SyntheticPageSet, self).__init__()
 
     urls_list = [
-      'http://aws1.mdw.la/fw',
+      'http://check.googlezip.net/test.html',
       'http://aws1.mdw.la/static'
     ]