Extensions Docs Server: Fix samples page and ExampleZipper

chrome/common/extensions/docs/server2/handler.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 logging
 import os
 from StringIO import StringIO
 import sys
 
 from appengine_wrappers import webapp
@@ skipping 75 matching lines @@
 
   cache_factory = CompiledFileSystem.Factory(file_system, branch_memcache)
   api_list_data_source_factory = APIListDataSource.Factory(cache_factory,
                                                            file_system,
                                                            API_PATH,
                                                            PUBLIC_TEMPLATE_PATH)
   intro_data_source_factory = IntroDataSource.Factory(
       cache_factory,
       [INTRO_PATH, ARTICLE_PATH])
   samples_data_source_factory = SamplesDataSource.Factory(
-      branch,
+      channel_name,
       file_system,
       GITHUB_FILE_SYSTEM,
       cache_factory,
       GITHUB_COMPILED_FILE_SYSTEM,
       EXAMPLES_PATH)
   api_data_source_factory = APIDataSource.Factory(cache_factory,
                                                   API_PATH,
                                                   samples_data_source_factory)
   template_data_source_factory = TemplateDataSource.Factory(
       channel_name,
@@ skipping 84 matching lines @@
     if path.startswith('/cron'):
       self._HandleCron(path)
     else:
       # Redirect paths like "directory" to "directory/". This is so relative
       # file paths will know to treat this as a directory.
       if os.path.splitext(path)[1] == '' and path[-1] != '/':
         self.redirect(path + '/')
       path = path.replace('/chrome/', '')
       path = path.strip('/')
       self._HandleGet(path)