Reland: Add button to add new FSP services to Files app.

ui/file_manager/integration_tests/file_manager/folder_shortcuts.js

Index: ui/file_manager/integration_tests/file_manager/folder_shortcuts.js
diff --git a/ui/file_manager/integration_tests/file_manager/folder_shortcuts.js b/ui/file_manager/integration_tests/file_manager/folder_shortcuts.js
index 9e3543604bd7f874b2d85499f0db1fb665937dae..a61d5a411296e90fd203ee4651244cff2a38c1eb 100644
--- a/ui/file_manager/integration_tests/file_manager/folder_shortcuts.js
+++ b/ui/file_manager/integration_tests/file_manager/folder_shortcuts.js
@@ -15,7 +15,7 @@ var TREEITEM_C = TREEITEM_B + '> .tree-children > div:nth-child(1) ';
 var TREEITEM_D = TREEITEM_DRIVE + '> .tree-children > div:nth-child(2) ';
 var TREEITEM_E = TREEITEM_D + '> .tree-children > div:nth-child(1) ';
 var EXPAND_ICON = '> .tree-row > .expand-icon';
-var VOLUME_ICON = '> .tree-row > .volume-icon';
+var ITEM_ICON = '> .tree-row > .item-icon';
 var EXPANDED_SUBTREE = '> .tree-children[expanded]';
 
 /**
@@ -42,13 +42,13 @@ var DIRECTORY = {
     contents: [ENTRIES.directoryA.getExpectedRow(),
                ENTRIES.directoryD.getExpectedRow()],
     name: 'Drive',
-    navItem: '#tree-item-autogen-id-2',
+    navItem: '#tree-item-autogen-id-3',
     treeItem: TREEITEM_DRIVE
   },
   A: {
     contents: [ENTRIES.directoryB.getExpectedRow()],
     name: 'A',
-    navItem: '#tree-item-autogen-id-13',
+    navItem: '#tree-item-autogen-id-14',
     treeItem: TREEITEM_A
   },
   B: {
@@ -59,13 +59,13 @@ var DIRECTORY = {
   C: {
     contents: [],
     name: 'C',
-    navItem: '#tree-item-autogen-id-13',
+    navItem: '#tree-item-autogen-id-14',
     treeItem: TREEITEM_C
   },
   D: {
     contents: [ENTRIES.directoryE.getExpectedRow()],
     name: 'D',
-    navItem: '#tree-item-autogen-id-12',
+    navItem: '#tree-item-autogen-id-13',
     treeItem: TREEITEM_D
   },
   E: {
@@ -134,9 +134,9 @@ function expandDirectoryTree(windowId) {
  */
 function navigateToDirectory(windowId, directory) {
   return remoteCall.waitForElement(
-      windowId, directory.treeItem + VOLUME_ICON).then(function() {
+      windowId, directory.treeItem + ITEM_ICON).then(function() {
     return remoteCall.callRemoteTestUtil(
-        'fakeMouseClick', windowId, [directory.treeItem + VOLUME_ICON]);
+        'fakeMouseClick', windowId, [directory.treeItem + ITEM_ICON]);
   }).then(function(result) {
     chrome.test.assertTrue(result);
     return remoteCall.waitForFiles(windowId, directory.contents);