Fixing ChromeOS File Browser test harness.

chrome/browser/resources/file_manager/js/harness.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 var harness = {
   /**
    * Kick off the test harness.
    *
    * Called by harness.html after the dom has been parsed.
    */
   init: function() {
     console.log('Initializing harness...');
 
     util.installFileErrorToString();
 
     var self = this;
 
     function onFilesystem(filesystem) {
       console.log('Filesystem found.');
       self.filesystem = filesystem;
       util.getOrCreateDirectory(filesystem.root, '/Downloads', function () {});
       util.getOrCreateDirectory(filesystem.root, '/removable', function () {});
       util.getOrCreateDirectory(filesystem.root, '/removable/disk1',
           function () {});
       util.getOrCreateDirectory(filesystem.root, '/removable/disk2',
           function () {});
-    };
+    }
 
-    window.webkitRequestFileSystem(window.PERSISTENT, 16 * 1024 * 1024,
-                                   onFilesystem,
-                                   util.flog('Error initializing filesystem'));
+    window.webkitStorageInfo.requestQuota(
+        window.PERSISTENT,
+        1024*1024*1024, // 1 Gig should be enough for everybody:)
+        function(grantedBytes) {
+          window.webkitRequestFileSystem(
+              window.PERSISTENT,
+              grantedBytes,
+              onFilesystem,
+              util.flog('Error initializing filesystem'));
+        },
+        util.flog('Error requesting filesystem quota'));
 
     var paramstr = decodeURIComponent(document.location.search.substr(1));
     this.params = paramstr ? JSON.parse(paramstr) : {};
 
     var input = document.getElementById('default-path');
     input.value = this.params.defaultPath || '';
     input.addEventListener('keyup', this.onInputKeyUp.bind(this));
 
     var iframe = document.getElementById('dialog');
     iframe.setAttribute('src', 'main.html' + document.location.search);
@@ skipping 87 matching lines @@
                                          currentDest.fullPath));
     }
 
     function processNextFile() {
       if (files.length == 0) {
         console.log('Import complete: ' + importCount + ' file(s)');
         return;
       }
 
       currentSrc = files.shift();
-      var destPath = harness.fileManager.currentDirEntry_.fullPath + '/' +
+      var destPath = harness.fileManager.getCurrentDirectory() + '/' +
           currentSrc.name.replace(/\^\^/g, '/');
       util.getOrCreateFile(self.filesystem.root, destPath, onFileFound,
                            util.flog('Error finding path: ' + destPath));
     }
 
     console.log('Start import: ' + files.length + ' file(s)');
     processNextFile();
-  },
+  }
 };