Media Galleries API Picasa: End-to-end browsertest.

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/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
@@ skipping 323 matching lines @@
     : weak_factory_(this),
       profile_(profile),
       extension_prefs_for_testing_(NULL) {
   AddDefaultGalleriesIfFreshProfile();
 
   // Look for optional default galleries every time.
   itunes::ITunesFinder::FindITunesLibrary(
       base::Bind(&MediaGalleriesPreferences::OnITunesDeviceID,
                  weak_factory_.GetWeakPtr()));
 
-  // TODO(tommycli): Turn on when Picasa code is ready.
-#if 0
-  picasa::PicasaFinder::FindPicasaDatabaseOnUIThread(
+  picasa::PicasaFinder::FindPicasaDatabase(

[tommycli, 2013/09/16 19:35:45]

Currently requires it to be 'on' for browser test to work. There's probably a
way to hack it so that this doesn't have to be ON, but we should talk about
this.

[vandebo (ex-Chrome), 2013/09/17 21:18:06]

This seems fine, just don't land it before the branch cut.

       base::Bind(&MediaGalleriesPreferences::OnPicasaDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 
   InitFromPrefs(false /*no notification*/);
 
   StorageMonitor::GetInstance()->AddObserver(this);
 }
 
 MediaGalleriesPreferences::~MediaGalleriesPreferences() {
   if (StorageMonitor::GetInstance())
     StorageMonitor::GetInstance()->RemoveObserver(this);
 }
@@ skipping 578 matching lines @@
 ExtensionPrefs* MediaGalleriesPreferences::GetExtensionPrefs() const {
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   extension_prefs_for_testing_ = extension_prefs;
 }