Extensions Docs Server: Fix samples page and ExampleZipper

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

Index: chrome/common/extensions/docs/server2/samples_data_source.py
diff --git a/chrome/common/extensions/docs/server2/samples_data_source.py b/chrome/common/extensions/docs/server2/samples_data_source.py
index 76c29f30bb783df16b3b07d696a6fae4bdffa090..750b2a79165a52e4fe79757bf2c4a0c9654911a7 100644
--- a/chrome/common/extensions/docs/server2/samples_data_source.py
+++ b/chrome/common/extensions/docs/server2/samples_data_source.py
@@ -22,7 +22,7 @@ class SamplesDataSource(object):
     Requests.
     """
     def __init__(self,
-                 branch,
+                 channel,
                  file_system,
                  github_file_system,
                  cache_factory,
@@ -30,7 +30,7 @@ class SamplesDataSource(object):
                  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)