Expose gallery watching functionality to the public mediaGalleries API.

chrome/test/data/extensions/api_test/media_galleries/gallerywatch/test.js

Index: chrome/test/data/extensions/api_test/media_galleries/gallerywatch/test.js
diff --git a/chrome/test/data/extensions/api_test/media_galleries_private/gallerywatch/test.js b/chrome/test/data/extensions/api_test/media_galleries/gallerywatch/test.js
similarity index 73%
copy from chrome/test/data/extensions/api_test/media_galleries_private/gallerywatch/test.js
copy to chrome/test/data/extensions/api_test/media_galleries/gallerywatch/test.js
index c28e436e1c0546864e031af89e338b5d6dad2fe7..a2f427f08ed592f08485e0948d19a7b700179b41 100644
--- a/chrome/test/data/extensions/api_test/media_galleries_private/gallerywatch/test.js
+++ b/chrome/test/data/extensions/api_test/media_galleries/gallerywatch/test.js
@@ -18,10 +18,15 @@ var onGalleryChangedCallback = function (details) {
 
 // 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.
@@ -33,7 +38,7 @@ var getAllGalleryWatchCallback = function (results) {
   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');
@@ -46,7 +51,7 @@ var getAllGalleryWatchCallback = function (results) {
 
 // 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');
 };
@@ -54,14 +59,25 @@ function addGalleryChangedListener() {
 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');
 }
@@ -74,23 +90,23 @@ function getMediaFileSystems() {
 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');
 };