Enable gallery watches on Mac

Resubmit of https://codereview.chromium.org/332003002

BUG=144491

Review URL: https://codereview.chromium.org/340543002

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

chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

@@ -92,15 +92,12 @@ GalleryWatchStateTracker::~GalleryWatchStateTracker() {
 GalleryWatchStateTracker* GalleryWatchStateTracker::GetForProfile(
     Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-#if defined(OS_WIN) || defined(OS_LINUX)
-  // Gallery watch operation is not supported on Mac: crbug.com/144491.
   DCHECK(profile);
   MediaGalleriesPrivateAPI* private_api =
       MediaGalleriesPrivateAPI::Get(profile);
   // In unit tests, we don't have a MediaGalleriesPrivateAPI.
   if (private_api)
     return private_api->GetGalleryWatchStateTracker();
-#endif
   return NULL;
 }
 

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc

@@ -192,7 +192,6 @@ void MediaGalleriesPrivateAddGalleryWatchFunction::OnPreferencesInit(
     return;
   }
 
-#if defined(OS_WIN) || defined(OS_LINUX)
   MediaGalleriesPrivateEventRouter* router =
       MediaGalleriesPrivateAPI::Get(GetProfile())->GetEventRouter();
   DCHECK(router);
@@ -208,11 +207,6 @@ void MediaGalleriesPrivateAddGalleryWatchFunction::OnPreferencesInit(
       base::Bind(&MediaGalleriesPrivateAddGalleryWatchFunction::HandleResponse,
                  this,
                  gallery_pref_id));
-#else
-  // Recursive gallery watch operation is not currently supported on Mac:
-  // crbug.com/144491
-  HandleResponse(gallery_pref_id, false);
-#endif
 }
 
 void MediaGalleriesPrivateAddGalleryWatchFunction::HandleResponse(
@@ -248,8 +242,6 @@ bool MediaGalleriesPrivateRemoveGalleryWatchFunction::RunAsync() {
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
-  // Remove gallery watch operation is currently supported on Mac:
-  // crbug.com/144491
   scoped_ptr<RemoveGalleryWatch::Params> params(
       RemoveGalleryWatch::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ -266,7 +258,6 @@ bool MediaGalleriesPrivateRemoveGalleryWatchFunction::RunAsync() {
 
 void MediaGalleriesPrivateRemoveGalleryWatchFunction::OnPreferencesInit(
     const std::string& pref_id) {
-#if defined(OS_WIN) || defined(OS_LINUX)
   base::FilePath gallery_file_path;
   MediaGalleryPrefId gallery_pref_id = 0;
   if (!GetGalleryFilePathAndId(pref_id,
@@ -290,7 +281,6 @@ void MediaGalleriesPrivateRemoveGalleryWatchFunction::OnPreferencesInit(
   GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get(
       GetProfile())->GetGalleryWatchStateTracker();
   state_tracker->OnGalleryWatchRemoved(extension_id(), gallery_pref_id);
-#endif
   SendResponse(true);
 }
 
@@ -318,7 +308,6 @@ bool MediaGalleriesPrivateGetAllGalleryWatchFunction::RunAsync() {
 
 void MediaGalleriesPrivateGetAllGalleryWatchFunction::OnPreferencesInit() {
   std::vector<std::string> result;
-#if defined(OS_WIN) || defined(OS_LINUX)
   GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get(
       GetProfile())->GetGalleryWatchStateTracker();
   MediaGalleryPrefIdSet gallery_ids =
@@ -327,7 +316,6 @@ void MediaGalleriesPrivateGetAllGalleryWatchFunction::OnPreferencesInit() {
        iter != gallery_ids.end(); ++iter) {
     result.push_back(base::Uint64ToString(*iter));
   }
-#endif
   results_ = GetAllGalleryWatch::Results::Create(result);
   SendResponse(true);
 }
@@ -355,7 +343,6 @@ bool MediaGalleriesPrivateRemoveAllGalleryWatchFunction::RunAsync() {
 }
 
 void MediaGalleriesPrivateRemoveAllGalleryWatchFunction::OnPreferencesInit() {
-#if defined(OS_WIN) || defined(OS_LINUX)
   MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(
           GetProfile());
@@ -363,7 +350,6 @@ void MediaGalleriesPrivateRemoveAllGalleryWatchFunction::OnPreferencesInit() {
       GetProfile())->GetGalleryWatchStateTracker();
   state_tracker->RemoveAllGalleryWatchersForExtension(
       extension_id(), preferences);
-#endif
   SendResponse(true);
 }
 

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

@@ -33,14 +33,14 @@ var getAllGalleryWatchCallback = function (results) {
   if (results.length == 0) {
     chrome.test.sendMessage('gallery_watchers_does_not_exists');
   } else {
-    var gallery_ids_str = "";
-    for (var i = 0; i < results.length; ++i) {
-      if (gallery_ids_str != "")
-        gallery_ids_str += ", ";
-      gallery_ids_str += results[i];
+    for (var i = 0; i < results.lendth; ++i) {
+      var info = chrome.mediaGalleries.getMediaFileSystemMetadata(galleries[i]);
+      if (results[i] !== info.galleryId) {
+        chrome.test.sendMessage('gallery_watcher_mismatch');
+        return;
+      }
     }
-    chrome.test.sendMessage(
-       'watchers_for_galleries_{' + gallery_ids_str + '}_found');
+    chrome.test.sendMessage('gallery_watcher_checks');
   }
 };