Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

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

 # Copyright (c) 2012 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 base64
 
 from appengine_wrappers import urlfetch
 from future import Future
 
 class _AsyncFetchDelegate(object):
@@ skipping 13 matching lines @@
 class AppEngineUrlFetcher(object):
   """A wrapper around the App Engine urlfetch module that allows for easy
   async fetches.
   """
   def __init__(self, base_path=None):
     self._base_path = base_path
 
   def Fetch(self, url, username=None, password=None):
     """Fetches a file synchronously.
     """
-    headers = _MakeHeaders(username, password)
     if self._base_path is not None:
-      return urlfetch.fetch('%s/%s' % (self._base_path, url), headers=headers)
-    else:
-      return urlfetch.fetch(url, headers={ 'Cache-Control': 'max-age=0' })
+      url = '%s/%s' % (self._base_path, url)
+    return urlfetch.fetch(url, headers=_MakeHeaders(username, password))
 
   def FetchAsync(self, url, username=None, password=None):
     """Fetches a file asynchronously, and returns a Future with the result.
     """
+    if self._base_path is not None:
+      url = '%s/%s' % (self._base_path, url)
     rpc = urlfetch.create_rpc()
-    headers = _MakeHeaders(username, password)
-    if self._base_path is not None:
-      urlfetch.make_fetch_call(rpc,
-                               '%s/%s' % (self._base_path, url),
-                               headers=headers)
-    else:
-      urlfetch.make_fetch_call(rpc, url, headers=headers)
+    urlfetch.make_fetch_call(rpc, url, headers=_MakeHeaders(username, password))
     return Future(delegate=_AsyncFetchDelegate(rpc))