Merge 82577 - FileManager: assorted fixes* Switch webkitRequestFileSystem/webkitResolveLocalFileS...

chrome/browser/resources/file_manager/js/exif_reader.js

 // Copyright (c) 2011 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 exif = {
   verbose: false,
 
   messageHandlers: {
     "init": function() {
       this.log('thumbnailer initialized');
@@ skipping 20 matching lines @@
       self.vlog('Error processing: ' + fileURL + ': step: ' +
                 steps[currentStep].name + ": " + err);
 
       postMessage({verb: 'give-exif-error',
                    arguments: [fileURL, steps[currentStep].name, err]});
     }
 
     var steps =
     [ // Step one, turn the url into an entry.
       function getEntry() {
-        resolveLocalFileSystemURL(fileURL,
-                                  function(entry) { nextStep(entry) },
-                                  onError);
+        webkitResolveLocalFileSystemURL(fileURL,
+                                        function(entry) { nextStep(entry) },
+                                        onError);
       },
 
       // Step two, turn the entry into a file.
       function getFile(entry) {
         entry.file(function(file) { nextStep(file) }, onError);
       },
 
       // Step three, read the file header into a byte array.
       function readHeader(file) {
         var reader = new FileReader(file.webkitSlice(0, 1024));
@@ skipping 275 matching lines @@
   skip: function(count) {
     this.pos_ += count;
   },
 
   tell: function() {
     return this.pos_;
   }
 };
 
 var onmessage = exif.onMessage.bind(exif);