gdata: Apply correct mount label when mounting archives in GData

chrome/test/data/extensions/api_test/filebrowser_mount/test.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // These have to be sync'd with file_browser_private_apitest.cc
 var expectedVolume1 = {
   devicePath: 'device_path1',
   mountPath: 'removable/mount_path1',
   systemPath: 'system_path1',
   filePath: 'file_path1',
@@ skipping 31 matching lines @@
   driveLabel: 'drive_label3',
   deviceType: 'optical',
   totalSize: 0,
   isParent: true,
   isReadOnly: false,
   hasMedia: false,
   isOnBootDevice: true
 };
 
 // List of expected mount points.
-// We have to treat archives specially because their sourceUrl is set to
-// filesystem url. To make it easier to define expectation for archives,
-// instead of sourceUrl, we set sourcePath that will be converted to filesystem
-// url when received mountPoint is verified.
 // NOTE: this has to be synced with values in file_browser_private_apitest.cc
 //       and values sorted by mountPath.
 var expectedMountPoints = [
   {
-    sourcePath: 'removable/archive_path',
+    sourcePath: '/media/removable/archive_path',
     mountPath: 'archive/archive_mount_path',
     mountType: 'file',
     mountCondition: ''
   },
   {
-    sourceUrl: 'device_path1',
+    sourcePath: 'device_path1',
     mountPath: 'removable/mount_path1',
     mountType: 'device',
     mountCondition: ''
   },
   {
-    sourceUrl: 'device_path2',
+    sourcePath: 'device_path2',
     mountPath: 'removable/mount_path2',
     mountType: 'device',
     mountCondition: ''
   },
   {
-    sourceUrl: 'device_path3',
+    sourcePath: 'device_path3',
     mountPath: 'removable/mount_path3',
     mountType: 'device',
     mountCondition: ''
   }
 ];
 
-function treatMountPointException(received, expected, key) {
-  if (key != 'sourcePath')
-    return { wasValidated: false, success: false };
-  var expectedSourceUrl = createFileUrl(expected[key]);
-  var success = (expectedSourceUrl == received['sourceUrl']);
-  if (!success)
-    console.warn("Expected mount point's sourceUrl to be '" +
-                 expectedSourceUrl + "' but got '" + received['sourceUrl'] +
-                 "' instead.");
-  return { wasValidated: true, success: success };
-}
-
-function validateObject(received, expected, name, treatException) {
+function validateObject(received, expected, name) {
   for (var key in expected) {
-    var validated = treatException &&
-                    treatException(received, expected, key);
-    if (validated && validated.wasValidated) {
-      if (validated.success) {
-        continue;
-      } else {
-        return false;
-      }
-    }
     if (received[key] != expected[key]) {
       console.warn('Expected "' + key + '" ' + name + ' property to be: "' +
                   expected[key] + '"' + ', but got: "' + received[key] +
                   '" instead.');
       return false;
     }
   }
   if (Object.keys(expected).length != Object.keys(received).length) {
     console.warn('Unexpected property found in returned volume');
     return false;
@@ skipping 73 matching lines @@
         chrome.test.callbackFail('Invalid mount path.'));
   },
 
   function getMountPointsTest() {
     chrome.fileBrowserPrivate.getMountPoints(
         chrome.test.callbackPass(function(result) {
           chrome.test.assertEq(result.length, expectedMountPoints.length,
               'getMountPoints returned wrong number of mount points.');
           for (var i = 0; i < expectedMountPoints.length; i++) {
             chrome.test.assertTrue(
-                validateObject(result[i], expectedMountPoints[i], 'mountPoint',
-                               treatMountPointException),
+                validateObject(result[i], expectedMountPoints[i], 'mountPoint'),
                 'getMountPoints result[' + i + '] not as expected');
           }
     }));
   }
 ]);