[MediaGalleries] Enable iPhoto gallery

chrome/browser/media_galleries/media_galleries_preferences.cc

 // 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.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/base_paths_posix.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
@@ skipping 383 matching lines @@
   }
 
   on_initialize_callbacks_.push_back(callback);
   if (on_initialize_callbacks_.size() > 1)
     return;
 
   // This counter must match the number of async methods dispatched below.
   // It cannot be incremented inline with each callback, as some may return
   // synchronously, decrement the counter to 0, and prematurely trigger
   // FinishInitialization.
-  pre_initialization_callbacks_waiting_ = 3;
+  pre_initialization_callbacks_waiting_ = 4;
 
   // Check whether we should be initializing -- are there any extensions that
   // are using media galleries?
   media_galleries::UsageCount(media_galleries::PREFS_INITIALIZED);
   if (NumberExtensionsUsingMediaGalleries(profile_) == 0) {
     media_galleries::UsageCount(media_galleries::PREFS_INITIALIZED_ERROR);
   }
 
   // We determine the freshness of the profile here, before any of the finders
   // return and add media galleries to it.
   StorageMonitor::GetInstance()->EnsureInitialized(
       base::Bind(&MediaGalleriesPreferences::OnStorageMonitorInit,
                  weak_factory_.GetWeakPtr(),
                  !APIHasBeenUsed(profile_) /* add_default_galleries */));
 
   // Look for optional default galleries every time.
   iapps::FindITunesLibrary(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 
   picasa::FindPicasaDatabase(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 
-#if 0
   iapps::FindIPhotoLibrary(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 }
 
 bool MediaGalleriesPreferences::IsInitialized() const { return initialized_; }
 
 Profile* MediaGalleriesPreferences::profile() { return profile_; }
 
 void MediaGalleriesPreferences::OnInitializationCallbackReturned() {
   DCHECK(!IsInitialized());
   DCHECK(pre_initialization_callbacks_waiting_ > 0);
   if (--pre_initialization_callbacks_waiting_ == 0)
@@ skipping 662 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }