Expose gallery watching functionality to the public mediaGalleries API.

chrome/test/data/extensions/api_test/media_galleries/gallerywatch/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.
 
 var galleries;
 var invalidGalleryId = '11000';
 
 // chrome.mediaGalleries.getMediaFileSystems callback.
 var mediaFileSystemsListCallback = function (results) {
   galleries = results;
   chrome.test.sendMessage('get_media_file_systems_callback_ok');
 };
 
 // Gallery changed event handler.
 var onGalleryChangedCallback = function (details) {
   chrome.test.sendMessage('gallery_changed_event_received');
 };
 
 // Add watch request callback.
 var onAddWatchRequestCallback = function (details) {
-  if (!details || !details.success)
+  if (!!chrome.runtime.lastError) {

[tommycli, 2014/08/19 16:36:03]

never seen the double bang trick before. Woo learn something new everyday! =)

[Oren Blasberg, 2014/08/20 22:59:37]

It's actually kind of bad since !!0 will still return false. If we're checking
for the presence of something it's generally safer to explicitly convert to null
and undefined .. but in this test we can be reasonably confident about it.

+    chrome.test.sendMessage('add_watch_request_runtime_error');
+  }
+
+  if (!details || !details.success) {
     chrome.test.sendMessage('add_watch_request_failed');
-  else
+  } else {
     chrome.test.sendMessage('add_watch_request_succeeded');
+  }
 };
 
 // chrome.mediaGalleries.getAllGalleryWatch callback.
 var getAllGalleryWatchCallback = function (results) {
   if (!results) {
     chrome.test.sendMessage('get_all_gallery_watch_failed');
     return;
   }
   if (results.length == 0) {
     chrome.test.sendMessage('gallery_watchers_does_not_exists');
   } else {
-    for (var i = 0; i < results.lendth; ++i) {
+    for (var i = 0; i < results.length; ++i) {

[tommycli, 2014/08/19 16:36:03]

I'm glad we got someone who knows JS to look at our test.js files. You'll
probably find tons of errors in the javascript files of Chrome, since we are
mostly JS novices.

[Oren Blasberg, 2014/08/20 22:59:37]

Hehe, thanks. Having a js compiler helps.

       var info = chrome.mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
       if (results[i] !== info.galleryId) {
         chrome.test.sendMessage('gallery_watcher_mismatch');
         return;
       }
     }
     chrome.test.sendMessage('gallery_watcher_checks');
   }
 };
 
 // Helpers to add and remove event listeners.
 function addGalleryChangedListener() {
-  chrome.mediaGalleriesPrivate.onGalleryChanged.addListener(
+  chrome.mediaGalleries.onGalleryChanged.addListener(
       onGalleryChangedCallback);
   chrome.test.sendMessage('add_gallery_changed_listener_ok');
 };
 
 function setupWatchOnValidGalleries() {
   for (var i = 0; i < galleries.length; ++i) {
     var info = chrome.mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
-    chrome.mediaGalleriesPrivate.addGalleryWatch(info.galleryId,
+    chrome.mediaGalleries.addGalleryWatch(info.galleryId,
                                                  onAddWatchRequestCallback);
   }
   chrome.test.sendMessage('add_gallery_watch_ok');
 };
 
+function setupWatchOnUnlistenedValidGalleries() {
+  var lastErrorSet = true;
+  for (var i = 0; i < galleries.length; ++i) {
+    var info = chrome.mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
+    chrome.mediaGalleries.addGalleryWatch(info.galleryId,
+                                                 onAddWatchRequestCallback);

[tommycli, 2014/08/19 16:36:03]

indent

[Oren Blasberg, 2014/08/20 22:59:37]

Done.

+  }
+
+  chrome.test.sendMessage('add_gallery_watch_ok');
+};
+
 function setupWatchOnInvalidGallery() {
-  chrome.mediaGalleriesPrivate.addGalleryWatch(invalidGalleryId,
+  chrome.mediaGalleries.addGalleryWatch(invalidGalleryId,
                                                onAddWatchRequestCallback);
   chrome.test.sendMessage('add_gallery_watch_ok');
 }
 
 function getMediaFileSystems() {
   chrome.mediaGalleries.getMediaFileSystems(mediaFileSystemsListCallback);
   chrome.test.sendMessage('get_media_file_systems_ok');
 };
 
 function removeGalleryWatch() {
   for (var i = 0; i < galleries.length; ++i) {
     var info = chrome.mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
-    chrome.mediaGalleriesPrivate.removeGalleryWatch(info.galleryId);
+    chrome.mediaGalleries.removeGalleryWatch(info.galleryId);
   }
   chrome.test.sendMessage('remove_gallery_watch_ok');
 };
 
 function removeGalleryChangedListener() {
-  chrome.mediaGalleriesPrivate.onGalleryChanged.removeListener(
+  chrome.mediaGalleries.onGalleryChanged.removeListener(
       onGalleryChangedCallback);
   chrome.test.sendMessage('remove_gallery_changed_listener_ok');
 };
 
 function getAllWatchedGalleryIds() {
-  chrome.mediaGalleriesPrivate.getAllGalleryWatch(getAllGalleryWatchCallback);
+  chrome.mediaGalleries.getAllGalleryWatch(getAllGalleryWatchCallback);
   chrome.test.sendMessage('get_all_gallery_watch_ok');
 };
 
 function removeAllGalleryWatch() {
-  chrome.mediaGalleriesPrivate.removeAllGalleryWatch();
+  chrome.mediaGalleries.removeAllGalleryWatch();
   chrome.test.sendMessage('remove_all_gallery_watch_ok');
 };