Docserver: Make the .html extension unnecessary for content pages, for example,

chrome/common/extensions/docs/server2/path_canonicalizer.py

Index: chrome/common/extensions/docs/server2/path_canonicalizer.py
diff --git a/chrome/common/extensions/docs/server2/path_canonicalizer.py b/chrome/common/extensions/docs/server2/path_canonicalizer.py
index 1d7d7bf4671f5967fb6c1a3f35499ec86d60da2e..fd95e9b71b32dca54d69b96648e067918216b2ad 100644
--- a/chrome/common/extensions/docs/server2/path_canonicalizer.py
+++ b/chrome/common/extensions/docs/server2/path_canonicalizer.py
@@ -6,6 +6,7 @@ from collections import defaultdict
 import posixpath
 
 from path_util import SplitParent
+from special_paths import SITE_VERIFICATION_FILE
 
 
 def _SimplifyFileName(file_name):
@@ -17,49 +18,79 @@ def _SimplifyFileName(file_name):
 
 
 class PathCanonicalizer(object):
-  '''Transforms paths into their canonical forms. Since the dev server has had
+  '''Transforms paths into their canonical forms. Since the docserver has had
   many incarnations - e.g. there didn't use to be apps/ - there may be old
   paths lying around the webs. We try to redirect those to where they are now.
   '''
-  def __init__(self, compiled_fs_factory, file_system):
+  def __init__(self,
+               file_system,
+               object_store_creator,
+               strip_extensions):
+    # |strip_extensions| is a list of file extensions (e.g. .html) that should
+    # be stripped for a path's canonical form.
+    self._cache = object_store_creator.Create(
+        PathCanonicalizer, category=file_system.GetIdentity())
     self._file_system = file_system
-    # A lazily populated mapping of file names to a list of full paths that
-    # contain them.  For example,
-    #  - browserAction.html: [extensions/browserAction.html]
-    #  - storage.html: [apps/storage.html, extensions/storage.html]
-    self._files_to_paths = None
+    self._strip_extensions = strip_extensions
 
-  def _GetPotentialPaths(self, filename):
-    '''Returns the paths to any file called |filename|.
-    '''
-    if self._files_to_paths is None:
-      self._files_to_paths = defaultdict(list)
+  def _LoadCache(self):
+    cached = self._cache.GetMulti(('canonical_paths',
+                                   'simplified_paths_map')).Get()
+
+    # |canonical_paths| is the pre-calculated set of canonical paths.
+    # |simplified_paths_map| is a lazily populated mapping of simplified file
+    # names to a list of full paths that contain them. For example,
+    #  - browseraction: [extensions/browserAction.html]
+    #  - storage: [apps/storage.html, extensions/storage.html]
+    canonical_paths, simplified_paths_map = (
+        cached.get('canonical_paths'), cached.get('simplified_paths_map'))
+
+    if canonical_paths is None:
+      assert simplified_paths_map is None
+      canonical_paths = set()
+      simplified_paths_map = defaultdict(list)
       for base, dirs, files in self._file_system.Walk(''):
-        for f in dirs + files:
-          self._files_to_paths[_SimplifyFileName(f)].append(
-              posixpath.join(base, f))
-    return self._files_to_paths.get(_SimplifyFileName(filename))
+        for path in dirs + files:
+          path_without_ext, ext = posixpath.splitext(path)
+          canonical_path = posixpath.join(base, path_without_ext)
+          if (ext not in self._strip_extensions or
+              path == SITE_VERIFICATION_FILE):
+            canonical_path += ext
+          canonical_paths.add(canonical_path)
+          simplified_paths_map[_SimplifyFileName(path)].append(canonical_path)
+      # Store |simplified_paths_map| sorted. Ties in length are broken by taking
+      # the shortest, lexicographically smallest path.
+      for path_list in simplified_paths_map.itervalues():
+        path_list.sort(key=lambda p: (len(p), p))
+      self._cache.SetMulti({
+        'canonical_paths': canonical_paths,
+        'simplified_paths_map': simplified_paths_map,
+      })
+    else:
+      assert simplified_paths_map is not None
+
+    return canonical_paths, simplified_paths_map
 
   def Canonicalize(self, path):
     '''Returns the canonical path for |path|.
     '''
+    canonical_paths, simplified_paths_map = self._LoadCache()
+
     # Path may already be the canonical path.
-    if self._file_system.Exists(path).Get():
+    if path in canonical_paths:
       return path
 
-    # Path not found. Our single heuristic: find |basename| in the directory
+    # Path not found. Our single heuristic: find |base| in the directory
     # structure with the longest common prefix of |path|.
     _, base = SplitParent(path)
-    potential_paths = self._GetPotentialPaths(base)
+    potential_paths = simplified_paths_map.get(_SimplifyFileName(base))
     if not potential_paths:
-      # There is no file with that name.
+      # There is no file with anything close to that name.
       return path
 
-    # The most likely canonical file is the one with the longest common prefix.
-    # This is slightly weaker than it could be; |path| is compared, not the
-    # simplified form of |path|, which may matter. Ties in length are broken by
-    # taking the shortest, lexicographically smallest path.
-    potential_paths.sort(key=lambda p: (len(p), p))
+    # The most likely canonical file is the one with the longest common prefix
+    # with |path|. This is slightly weaker than it could be; |path| is
+    # compared, not the simplified form of |path|, which may matter.
     max_prefix = potential_paths[0]
     max_prefix_length = len(posixpath.commonprefix((max_prefix, path)))
     for path_for_file in potential_paths[1:]: