Extensions Docs Server: Fix samples page and ExampleZipper

chrome/common/extensions/docs/server2/samples_data_source.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 json
 import logging
 import re
 
 import compiled_file_system as compiled_fs
 import third_party.json_schema_compiler.json_comment_eater as json_comment_eater
 import third_party.json_schema_compiler.model as model
 import url_constants
 
 DEFAULT_ICON_PATH = '/images/sample-default-icon.png'
 
 class SamplesDataSource(object):
   """Constructs a list of samples and their respective files and api calls.
   """
 
   class Factory(object):
     """A factory to create SamplesDataSource instances bound to individual
     Requests.
     """
     def __init__(self,
-                 branch,
+                 channel,
                  file_system,
                  github_file_system,
                  cache_factory,
                  github_cache_factory,
                  samples_path):
       self._file_system = file_system
       self._github_file_system = github_file_system
-      self._static_path = ((('/' + branch) if branch != 'local' else '') +
+      self._static_path = ((('/' + channel) if channel != 'local' else '') +
                            '/static')
       self._extensions_cache = cache_factory.Create(self._MakeSamplesList,
                                                     compiled_fs.EXTENSIONS)
       self._apps_cache = github_cache_factory.Create(
           lambda x: self._MakeSamplesList(x, is_apps=True),
           compiled_fs.APPS)
       self._samples_path = samples_path
 
     def Create(self, request):
       """Returns a new SamplesDataSource bound to |request|.
@@ skipping 159 matching lines @@
     return return_list
 
   def __getitem__(self, key):
     return self.get(key)
 
   def get(self, key):
     return {
       'apps': lambda: self._CreateSamplesDict('apps'),
       'extensions': lambda: self._CreateSamplesDict('extensions')
     }.get(key, lambda: {})()