sandwich: Move all NoState-Prefetch related code in sandwich_prefetch.py

tools/android/loading/sandwich_misc_unittest.py

Index: tools/android/loading/sandwich_misc_unittest.py
diff --git a/tools/android/loading/sandwich_misc_unittest.py b/tools/android/loading/sandwich_misc_unittest.py
deleted file mode 100644
index 9e5e4554b981bedf40d32c5b6da869e96699c33e..0000000000000000000000000000000000000000
--- a/tools/android/loading/sandwich_misc_unittest.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2016 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 os
-import unittest
-import urlparse
-
-import sandwich_misc
-
-
-LOADING_DIR = os.path.dirname(__file__)
-TEST_DATA_DIR = os.path.join(LOADING_DIR, 'testdata')
-
-
-class SandwichMiscTest(unittest.TestCase):
-  _TRACE_PATH = os.path.join(TEST_DATA_DIR, 'scanner_vs_parser.trace')
-
-  def GetResourceUrl(self, path):
-    return urlparse.urljoin('http://l/', path)
-
-  def testNoDiscovererWhitelisting(self):
-    url_set = sandwich_misc.ExtractDiscoverableUrls(
-        self._TRACE_PATH, sandwich_misc.EMPTY_CACHE_DISCOVERER)
-    self.assertEquals(set(), url_set)
-
-  def testFullCacheWhitelisting(self):
-    reference_url_set = set([self.GetResourceUrl('./'),
-                             self.GetResourceUrl('0.png'),
-                             self.GetResourceUrl('1.png'),
-                             self.GetResourceUrl('favicon.ico')])
-    url_set = sandwich_misc.ExtractDiscoverableUrls(
-        self._TRACE_PATH, sandwich_misc.FULL_CACHE_DISCOVERER)
-    self.assertEquals(reference_url_set, url_set)
-
-  def testRedirectedMainWhitelisting(self):
-    reference_url_set = set([self.GetResourceUrl('./')])
-    url_set = sandwich_misc.ExtractDiscoverableUrls(
-        self._TRACE_PATH, sandwich_misc.REDIRECTED_MAIN_DISCOVERER)
-    self.assertEquals(reference_url_set, url_set)
-
-  def testParserDiscoverableWhitelisting(self):
-    reference_url_set = set([self.GetResourceUrl('./'),
-                             self.GetResourceUrl('0.png'),
-                             self.GetResourceUrl('1.png')])
-    url_set = sandwich_misc.ExtractDiscoverableUrls(
-        self._TRACE_PATH, sandwich_misc.PARSER_DISCOVERER)
-    self.assertEquals(reference_url_set, url_set)
-
-  def testHTMLPreloadScannerWhitelisting(self):
-    reference_url_set = set([self.GetResourceUrl('./'),
-                             self.GetResourceUrl('0.png')])
-    url_set = sandwich_misc.ExtractDiscoverableUrls(
-        self._TRACE_PATH, sandwich_misc.HTML_PRELOAD_SCANNER_DISCOVERER)
-    self.assertEquals(reference_url_set, url_set)
-
-
-if __name__ == '__main__':
-  unittest.main()