Revert 93813 - Re-landing for tbarzic@ - r93754:

Adding support for mount point different from removable devices to MountLibrary
(work in progress..have to add GetMountPoints support)

tested on ChromeOS with these three patches: http://gerrit.chromium.org/gerrit/#change,4447
http://gerrit.chromium.org/gerrit/#change,4449
http://gerrit.chromium.org/gerrit/#change,4544

BUG=chromium-os:17673,chromium-os:17783
TEST=Made sure mounting devices still works and that
     MountCompleted event gets through to
     file_browser_event_router (checking ui and chrome logs
     for mount completed entries)

TBR=tbarzic
Review URL: http://codereview.chromium.org/7492038

TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/7488043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93815 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 103 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 6c49f53..d341192 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -5176,26 +5176,6 @@
         }
       },
       {
-        "id": "MountPointInfo",
-        "type": "object",
-        "description": "Mounted point information.",
-        "properties": {
-          "mountPath": {
-            "type": "string",
-            "description": "Disk volume mount point path. The value corresponds to its Entry.fullPath in File API."
-          },
-          "sourcePath": {
-            "type": "string",
-            "description": "The path to the mounted resource. Either a device path, or a path to an archive file."
-          },
-          "mountType": {
-            "type": "string",
-            "enum": ["device", "file", "network"],
-            "description": "Type of the mount."
-          }
-        }
-      },
-      {
         "id": "VolumeMetadata",
         "type": "object",
         "description": "Mounted disk volume metadata.",
@@ -5268,39 +5248,6 @@
         }
       },
       {
-        "id": "MountCompletedEvent",
-        "type": "object",
-        "description": "Payload data for mount event.",
-        "properties": {
-          "eventType": {
-            "type": "string",
-            "enum": ["mount", "unmount"],
-            "description": "Is the event raised for mounting or unmounting."
-          },
-          "status": {
-            "type": "string",
-            "enum": ["success", "error_unknown", "error_internal",
-                     "error_unknown_filesystem", "error_unsuported_filesystem",
-                     "error_invalid_archive", "error_libcros_missing"],
-            "description": "Event type that tells listeners if mount was successfull or an error occurred. It also specifies the error."
-          },
-          "sourcePath": {
-            "type": "string",
-            "description": "Path that has been mounted."
-          },
-          "mountPath": {
-            "type": "string",
-            "optional": true,
-            "description": "Path that sourcePath was mounted to."
-          },
-          "mountType": {
-            "type": "string",
-            "enum": ["device", "file", "network"],
-            "description": "Type of the mount."
-          }
-        }
-      },
-      {
         "id": "FileWatchEvent",
         "type": "object",
         "description": "Payload data for disk mount / unmount event.",
@@ -5534,48 +5481,15 @@
         ]
       },
       {
-        "name": "addMount",
-        "type": "function",
-        "description": "Mount a resource or a file.",
-        "parameters": [
-          {
-            "name": "source",
-            "type": "string",
-            "description": "Mount point source. For compressed files it is relative file path within external file system"
-          },
-          {
-            "name": "mountType",
-            "type": "string",
-            "enum": ["device", "file", "network"],
-            "description": "Mount point type. 'file' for compressed files"
-          },
-          {
-            "name": "options",
-            "type": "object",
-            "description": "Name/value pairs for source specific options",
-            "optional": "true"
-          }
-        ]
-      },
-      {
-        "name": "removeMount",
-        "description": "Unmounts a mounted resource.",
+        "name": "unmountVolume",
+        "description": "Unmounts specified volume",
         "parameters": [
           {
-            "name": "mountPath",
+            "name": "devicePath",
             "type": "string",
-            "description": "A path of the mount."
+            "description": "Device path of the volume."
           }
         ]
-      },
-      {
-        "name": "getMountPoints",
-        "description": "Get the list of mount points.",
-        "returns": {
-          "type": "object",
-          "items": {"$ref": "MountPointInfo"},
-          "description": "The dictionary with mount point paths as elements and MountPointInfo as values."
-        }
       }
     ],
     "events": [
@@ -5592,18 +5506,6 @@
         ]
       },
       {
-        "name": "onMountCompleted",
-        "type": "function",
-        "description": "Fired when mount event is detected.",
-        "parameters": [
-          {
-            "$ref": "MountCompletedEvent",
-            "name": "event",
-            "description": "MountCompleted event information."
-          }
-        ]
-      },
-      {
         "name": "onFileChanged",
         "type": "function",
         "description": "Fired when watched file change event is detected.",
@@ -6483,7 +6385,7 @@
               "title": {
                 "type": "string",
                 "optional": true,
-                "description": "The title of the notification."
+                "description": "The title of the notification."  
               },
               "bodyText": {
                 "type": "string",