Index: chrome/common/extensions/docs/server2/jsc_view_test.py |
diff --git a/chrome/common/extensions/docs/server2/jsc_view_test.py b/chrome/common/extensions/docs/server2/jsc_view_test.py |
index 57d982306e215880075dc9732735de54f6a96679..b491ad6ca9400a787dc62f6ccede2c7eaa698b6e 100755 |
--- a/chrome/common/extensions/docs/server2/jsc_view_test.py |
+++ b/chrome/common/extensions/docs/server2/jsc_view_test.py |
@@ -69,7 +69,7 @@ class JSCViewTest(unittest.TestCase): |
server_instance = ServerInstance.ForTest( |
TestFileSystem(CANNED_TRUNK_FS_DATA, relative_to=CHROME_EXTENSIONS)) |
- file_system = server_instance.host_file_system_provider.GetTrunk() |
+ file_system = server_instance.host_file_system_provider.GetMaster() |
self._json_cache = server_instance.compiled_fs_factory.ForJson(file_system) |
self._features_bundle = FeaturesBundle(file_system, |
server_instance.compiled_fs_factory, |
@@ -265,7 +265,7 @@ class JSCViewWithoutNodeAvailabilityTest(unittest.TestCase): |
self._api_models = server_instance.platform_bundle.GetAPIModels( |
'extensions') |
self._json_cache = server_instance.compiled_fs_factory.ForJson( |
- server_instance.host_file_system_provider.GetTrunk()) |
+ server_instance.host_file_system_provider.GetMaster()) |
self._avail_finder = server_instance.platform_bundle.GetAvailabilityFinder( |
'extensions') |
@@ -273,7 +273,7 @@ class JSCViewWithoutNodeAvailabilityTest(unittest.TestCase): |
def testGetAPIAvailability(self): |
api_availabilities = { |
'bluetooth': 31, |
- 'contextMenus': 'trunk', |
+ 'contextMenus': 'master', |
'jsonStableAPI': 20, |
'idle': 5, |
'input.ime': 18, |
@@ -309,7 +309,7 @@ class JSCViewWithNodeAvailabilityTest(unittest.TestCase): |
self._branch_utility, |
CompiledFileSystem.Factory(test_object_store), |
self._node_fs_iterator, |
- self._node_fs_creator.GetTrunk(), |
+ self._node_fs_creator.GetMaster(), |
test_object_store, |
'extensions') |
@@ -319,7 +319,7 @@ class JSCViewWithNodeAvailabilityTest(unittest.TestCase): |
self._api_models = server_instance.platform_bundle.GetAPIModels( |
'extensions') |
self._json_cache = server_instance.compiled_fs_factory.ForJson( |
- server_instance.host_file_system_provider.GetTrunk()) |
+ server_instance.host_file_system_provider.GetMaster()) |
# Imitate the actual SVN file system by incrementing the stats for paths |
# where an API schema has changed. |
@@ -331,7 +331,7 @@ class JSCViewWithNodeAvailabilityTest(unittest.TestCase): |
# HACK: |file_system| is a MockFileSystem backed by a TestFileSystem. |
# Increment the TestFileSystem stat count. |
file_system._file_system.IncrementStat(by=last_stat.val) |
- # Continue looping. The iterator will stop after 'trunk' automatically. |
+ # Continue looping. The iterator will stop after 'master' automatically. |
return True |
# Use the HostFileSystemIterator created above to change global stat values |