Docserver: Convert more future Get calls to Thens

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 04ad9bef200d9c9a142f6618dd0ae89fa60c2a5f..a8a2892fc81cd69b51821ced43c5757d3de961e1 100644
--- a/chrome/common/extensions/docs/server2/path_canonicalizer.py
+++ b/chrome/common/extensions/docs/server2/path_canonicalizer.py
@@ -38,16 +38,12 @@ class PathCanonicalizer(object):
     self._strip_extensions = strip_extensions
 
   def _LoadCache(self):
-    cached_future = self._cache.GetMulti(('canonical_paths',
-                                          'simplified_paths_map'))
-
-    def resolve():
+    def resolve(cached):

[ahernandez, 2014/09/03 19:16:07]

Nit: choose a better name for this, like load.

       # |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]
-      cached = cached_future.Get()
       canonical_paths, simplified_paths_map = (
           cached.get('canonical_paths'), cached.get('simplified_paths_map'))
 
@@ -77,8 +73,9 @@ class PathCanonicalizer(object):
         assert simplified_paths_map is not None
 
       return canonical_paths, simplified_paths_map
+    return self._cache.GetMulti(('canonical_paths',
+                                 'simplified_paths_map')).Then(resolve)
 
-    return Future(callback=resolve)
 
   def Canonicalize(self, path):
     '''Returns the canonical path for |path|.