Files.app: Start to use new metadata model in Audio Player.

ui/file_manager/audio_player/js/audio_player.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.
 
 /**
  * Overrided metadata worker's path.
  * @type {string}
  * @const
  */
-ContentProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
+ContentMetadataProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
 
 /**
  * @param {HTMLElement} container Container element.
  * @constructor
  */
 function AudioPlayer(container) {
   this.container_ = container;
   this.volumeManager_ = new VolumeManagerWrapper(
       VolumeManagerWrapper.DriveEnabledStatus.DRIVE_ENABLED);
-  this.metadataCache_ = MetadataCache.createFull(this.volumeManager_);
+  this.fileSystemMetadata_ = FileSystemMetadata.create(
+      new MetadataProviderCache(), this.volumeManager_);
   this.selectedEntry_ = null;
 
   this.model_ = new AudioPlayerModel();
   var observer = new PathObserver(this.model_, 'expanded');
   observer.open(function(newValue, oldValue) {
     // Inverse arguments intentionally to match the Polymer way.
     this.onModelExpandedChanged(oldValue, newValue);
   }.bind(this));
 
   this.entries_ = [];
@@ skipping 34 matching lines @@
   // Show the window after DOM is processed.
   var currentWindow = chrome.app.window.current();
   if (currentWindow)
     setTimeout(currentWindow.show.bind(currentWindow), 0);
 }
 
 /**
  * Initial load method (static).
  */
 AudioPlayer.load = function() {
-  document.ondragstart = function(e) { e.preventDefault() };
+  document.ondragstart = function(e) { e.preventDefault(); };
 
   AudioPlayer.instance =
       new AudioPlayer(document.querySelector('.audio-player'));
 
   reload();
 };
 
 /**
  * Unloads the player.
  */
@@ skipping 144 matching lines @@
     this.selectedEntry_ = entry;
   }.bind(this));
 };
 
 /**
  * @param {FileEntry} entry Track file entry.
  * @param {function(object)} callback Callback.
  * @private
  */
 AudioPlayer.prototype.fetchMetadata_ = function(entry, callback) {
-  this.metadataCache_.getOne(entry, 'thumbnail|media|external',
+  this.fileSystemMetadata_.get(
+      [entry], ['mediaTitle', 'mediaArtist', 'present']).then(
       function(generation, metadata) {
         // Do nothing if another load happened since the metadata request.
         if (this.playlistGeneration_ == generation)
-          callback(metadata);
+          callback(metadata[0]);
       }.bind(this, this.playlistGeneration_));
 };
 
 /**
  * Media error handler.
  * @private
  */
 AudioPlayer.prototype.onError_ = function() {
   var track = this.currentTrackIndex_;
 
   this.invalidTracks_[track] = true;
 
   this.fetchMetadata_(
       this.entries_[track],
       function(metadata) {
-        var error = (!navigator.onLine && !metadata.external.present) ?
+        var error = (!navigator.onLine && !metadata.present) ?
             this.offlineString_ : this.errorString_;
         this.displayMetadata_(track, metadata, error);
         this.scheduleAutoAdvance_();
       }.bind(this));
 };
 
 /**
  * Toggles the expanded mode when resizing.
  *
  * @param {Event} event Resize event.
@@ skipping 111 matching lines @@
   this.artist = this.getDefaultArtist();
 
   // TODO(yoshiki): implement artwork.
   this.artwork = null;
   this.active = false;
 };
 
 /**
  * @return {HTMLDivElement} The wrapper element for the track.
  */
-AudioPlayer.TrackInfo.prototype.getBox = function() { return this.box_ };
+AudioPlayer.TrackInfo.prototype.getBox = function() { return this.box_; };
 
 /**
  * @return {string} Default track title (file name extracted from the url).
  */
 AudioPlayer.TrackInfo.prototype.getDefaultTitle = function() {
   var title = this.url.split('/').pop();
   var dotIndex = title.lastIndexOf('.');
   if (dotIndex >= 0) title = title.substr(0, dotIndex);
   title = decodeURIComponent(title);
   return title;
@@ skipping 12 matching lines @@
 };
 
 /**
  * @param {Object} metadata The metadata object.
  * @param {string} error Error string.
  */
 AudioPlayer.TrackInfo.prototype.setMetadata = function(
     metadata, error) {
   // TODO(yoshiki): Handle error in better way.
   // TODO(yoshiki): implement artwork (metadata.thumbnail)
-  this.title = (metadata.media && metadata.media.title) ||
-      this.getDefaultTitle();
-  this.artist = error ||
-      (metadata.media && metadata.media.artist) || this.getDefaultArtist();
+  this.title = metadata.mediaTitle || this.getDefaultTitle();
+  this.artist = error || metadata.mediaArtist || this.getDefaultArtist();
 };
 
 // Starts loading the audio player.
 window.addEventListener('polymer-ready', function(e) {
   AudioPlayer.load();
 });