Make mediaGalleriesPrivate.onDevice{Attached,Detached} work properly by always running the internal device tracking code.

BUG=155652
Review URL: https://codereview.chromium.org/11151010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162046 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 36 insertions, 4 deletions

diff --git a/chrome/test/data/extensions/api_test/media_galleries_private/attachdetach/test.js b/chrome/test/data/extensions/api_test/media_galleries_private/attachdetach/test.js
index 8f1eb63..76d6a55 100644
--- a/chrome/test/data/extensions/api_test/media_galleries_private/attachdetach/test.js
+++ b/chrome/test/data/extensions/api_test/media_galleries_private/attachdetach/test.js
@@ -4,18 +4,50 @@
 
 var attachedDeviceId = '42';
 
-chrome.mediaGalleriesPrivate.onDeviceAttached.addListener(function(details) {
+var testAttach = function(details) {
   // Save the device id for the detach test.
   attachedDeviceId = details.deviceId;
   // The C++ test code will check if this is ok.
   chrome.test.sendMessage('attach_test_ok,' + details.deviceName);
-});
+};
 
-chrome.mediaGalleriesPrivate.onDeviceDetached.addListener(function(details) {
+// Makes sure the detach device id matches and then ACK the detach event.
+var testDetach = function(details) {
   // The C++ test does not know the device id, so check here.
   if (details.deviceId != attachedDeviceId) {
     chrome.test.fail('Bad device id in onDeviceDetached test.');
     return;
   }
   chrome.test.sendMessage('detach_test_ok');
-});
+};
+
+// Simply ACK the detach event.
+var testDummyDetach = function(details) {
+  chrome.test.sendMessage('detach_test_ok');
+};
+
+// These functions add / remove listeners.
+function addAttachListener() {
+  chrome.mediaGalleriesPrivate.onDeviceAttached.addListener(testAttach);
+  chrome.test.sendMessage('add_attach_ok');
+}
+
+function addDetachListener() {
+  chrome.mediaGalleriesPrivate.onDeviceDetached.addListener(testDetach);
+  chrome.test.sendMessage('add_detach_ok');
+}
+
+function addDummyDetachListener() {
+  chrome.mediaGalleriesPrivate.onDeviceDetached.addListener(testDummyDetach);
+  chrome.test.sendMessage('add_dummy_detach_ok');
+}
+
+function removeAttachListener() {
+  chrome.mediaGalleriesPrivate.onDeviceAttached.removeListener(testAttach);
+  chrome.test.sendMessage('remove_attach_ok');
+}
+
+function removeDummyDetachListener() {
+  chrome.mediaGalleriesPrivate.onDeviceAttached.removeListener(testDummyDetach);
+  chrome.test.sendMessage('remove_dummy_detach_ok');
+}