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

tools/android/loading/sandwich_prefetch_unittest.py

Index: tools/android/loading/sandwich_prefetch_unittest.py
diff --git a/tools/android/loading/sandwich_misc_unittest.py b/tools/android/loading/sandwich_prefetch_unittest.py
similarity index 68%
rename from tools/android/loading/sandwich_misc_unittest.py
rename to tools/android/loading/sandwich_prefetch_unittest.py
index 9e5e4554b981bedf40d32c5b6da869e96699c33e..3c54dd5edba7575410f6f041dc96dacfdcbec494 100644
--- a/tools/android/loading/sandwich_misc_unittest.py
+++ b/tools/android/loading/sandwich_prefetch_unittest.py
@@ -6,22 +6,22 @@ import os
 import unittest
 import urlparse
 
-import sandwich_misc
+import sandwich_prefetch
 
 
 LOADING_DIR = os.path.dirname(__file__)
 TEST_DATA_DIR = os.path.join(LOADING_DIR, 'testdata')
 
 
-class SandwichMiscTest(unittest.TestCase):
+class SandwichPrefetchTestCase(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)
+    url_set = sandwich_prefetch._ExtractDiscoverableUrls(
+        self._TRACE_PATH, sandwich_prefetch.EMPTY_CACHE_DISCOVERER)
     self.assertEquals(set(), url_set)
 
   def testFullCacheWhitelisting(self):
@@ -29,29 +29,29 @@ class SandwichMiscTest(unittest.TestCase):
                              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)
+    url_set = sandwich_prefetch._ExtractDiscoverableUrls(
+        self._TRACE_PATH, sandwich_prefetch.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)
+    url_set = sandwich_prefetch._ExtractDiscoverableUrls(
+        self._TRACE_PATH, sandwich_prefetch.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)
+    url_set = sandwich_prefetch._ExtractDiscoverableUrls(
+        self._TRACE_PATH, sandwich_prefetch.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)
+    url_set = sandwich_prefetch._ExtractDiscoverableUrls(
+        self._TRACE_PATH, sandwich_prefetch.HTML_PRELOAD_SCANNER_DISCOVERER)
     self.assertEquals(reference_url_set, url_set)