Docserver: Use GitilesFileSystem instead of SubversionFileSystem

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

Index: chrome/common/extensions/docs/server2/availability_finder_test.py
diff --git a/chrome/common/extensions/docs/server2/availability_finder_test.py b/chrome/common/extensions/docs/server2/availability_finder_test.py
index 5e023a7bd7aa998f7564b7ba50842426154f4852..a8500302707f43b5526efe00aae061f56d0468c9 100755
--- a/chrome/common/extensions/docs/server2/availability_finder_test.py
+++ b/chrome/common/extensions/docs/server2/availability_finder_test.py
@@ -34,7 +34,7 @@ class AvailabilityFinderTest(unittest.TestCase):
         self._branch_utility,
         CompiledFileSystem.Factory(test_object_store),
         host_fs_iterator,
-        host_fs_creator.GetTrunk(),
+        host_fs_creator.GetMaster(),
         test_object_store,
         platform)
 
@@ -62,7 +62,7 @@ class AvailabilityFinderTest(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
@@ -114,7 +114,7 @@ class AvailabilityFinderTest(unittest.TestCase):
                          get_availability(api))
 
     # Testing APIs with predetermined availability.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'jsonTrunkAPI')
+    assertGet(ChannelInfo('master', 'master', 'master'), 'jsonTrunkAPI')
     assertGet(ChannelInfo('dev', CANNED_BRANCHES[31], 31), 'jsonDevAPI')
     assertGet(ChannelInfo('beta', CANNED_BRANCHES[30], 30), 'jsonBetaAPI')
     assertGet(ChannelInfo('stable', CANNED_BRANCHES[20], 20), 'jsonStableAPI')
@@ -137,22 +137,22 @@ class AvailabilityFinderTest(unittest.TestCase):
               scheduled=31)
 
     # Testing API channel existence for _manifest_features.json.
-    # Listed as 'trunk' on all channels.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'sync')
-    # No records of API until |trunk|.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'history')
+    # Listed as 'master' on all channels.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'sync')
+    # No records of API until |master|.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'history')
     # Listed as 'dev' on |dev|.
     assertGet(ChannelInfo('dev', CANNED_BRANCHES[31], 31), 'storage')
     # Stable in _manifest_features and into pre-18 versions.
     assertGet(ChannelInfo('stable', CANNED_BRANCHES[8], 8), 'pageAction')
 
     # Testing API channel existence for _permission_features.json.
-    # Listed as 'beta' on |trunk|.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'falseBetaAPI')
-    # Listed as 'trunk' on |trunk|.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'trunkAPI')
-    # Listed as 'trunk' on all development channels.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'declarativeContent')
+    # Listed as 'beta' on |master|.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'falseBetaAPI')
+    # Listed as 'master' on |master|.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'masterAPI')
+    # Listed as 'master' on all development channels.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'declarativeContent')
     # Listed as 'dev' on all development channels.
     assertGet(ChannelInfo('dev', CANNED_BRANCHES[31], 31), 'bluetooth')
     # Listed as 'dev' on |dev|.
@@ -166,8 +166,8 @@ class AvailabilityFinderTest(unittest.TestCase):
     assertGet(ChannelInfo('stable', CANNED_BRANCHES[5], 5), 'idle')
 
     # Switches between _features.json files across branches.
-    # Listed as 'trunk' on all channels, in _api, _permission, or _manifest.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'contextMenus')
+    # Listed as 'master' on all channels, in _api, _permission, or _manifest.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'contextMenus')
     # Moves between _permission and _manifest as file system is traversed.
     assertGet(ChannelInfo('stable', CANNED_BRANCHES[23], 23),
               'systemInfo.display')
@@ -176,8 +176,8 @@ class AvailabilityFinderTest(unittest.TestCase):
     # Mid-upgrade cases:
     # Listed as 'dev' on |beta| and 'beta' on |dev|.
     assertGet(ChannelInfo('dev', CANNED_BRANCHES[31], 31), 'notifications')
-    # Listed as 'beta' on |stable|, 'dev' on |beta|...until |stable| on trunk.
-    assertGet(ChannelInfo('trunk', 'trunk', 'trunk'), 'events')
+    # Listed as 'beta' on |stable|, 'dev' on |beta|...until |stable| on master.
+    assertGet(ChannelInfo('master', 'master', 'master'), 'events')
 
     # Check for differing availability across apps|extensions
     assertGet(ChannelInfo('stable', CANNED_BRANCHES[26], 26),
@@ -205,7 +205,7 @@ class AvailabilityFinderTest(unittest.TestCase):
       tabs_graph = avail_finder.GetAPINodeAvailability('tabs')
       fake_tabs_graph = avail_finder.GetAPINodeAvailability('fakeTabs')
 
-      assertEquals(True, self._branch_utility.GetChannelInfo('trunk'),
+      assertEquals(True, self._branch_utility.GetChannelInfo('master'),
           tabs_graph.Lookup('tabs', 'properties', 'fakeTabsProperty3'))
       assertEquals(True, self._branch_utility.GetChannelInfo('dev'),
           tabs_graph.Lookup('tabs', 'events', 'onActivated', 'parameters',
@@ -228,7 +228,7 @@ class AvailabilityFinderTest(unittest.TestCase):
           tabs_graph.Lookup('tabs', 'types', 'InjectDetails'))
 
       # Test inlined type.
-      assertEquals(True, self._branch_utility.GetChannelInfo('trunk'),
+      assertEquals(True, self._branch_utility.GetChannelInfo('master'),
           tabs_graph.Lookup('tabs', 'types', 'InlinedType'))
 
       # Test implicitly inlined type.