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

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index 8d8b3413fba9a265e8a31279b0a0d74c2a48a640..29f1bc834c0a97a50fe565bb9b4364a3c3bdf69a 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -23,6 +23,13 @@
 #include "content/public/test/test_utils.h"
 #include "extensions/common/switches.h"
 
+#if defined(OS_WIN) || defined(OS_MACOSX)
+#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
+#include "chrome/common/media_galleries/picasa_test_util.h"
+#include "chrome/common/media_galleries/picasa_types.h"
+#include "chrome/common/media_galleries/pmp_test_util.h"
+#endif
+
 using extensions::PlatformAppBrowserTest;
 
 namespace {
@@ -38,8 +45,6 @@ base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("/qux");
 
 const char kTestGalleries[] = "testGalleries(%d)";
 
-}  // namespace
-
 // This function is to ensure at least one (fake) media gallery exists for
 // testing platforms with no default media galleries, such as CHROMEOS.
 void MakeFakeMediaGalleryForTest(Profile* profile, const base::FilePath& path) {
@@ -64,6 +69,8 @@ void MakeFakeMediaGalleryForTest(Profile* profile, const base::FilePath& path) {
   content::RunAllPendingInMessageLoop();
 }
 
+}  // namespace
+
 class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
  protected:
   // Since ExtensionTestMessageListener does not work with RunPlatformAppTest(),
@@ -95,6 +102,27 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
     content::RunAllPendingInMessageLoop();
   }
 
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  // This initializes the storage monitor, MediaGalleriesPreferences, and
+  // injects a custom Picasa database location.
+  void SetMediaGalleriesPreferencesForPicasaTest(

[vandebo (ex-Chrome), 2013/09/18 15:49:35]

It's not clear to me that you need this function at all - maybe you do because
there's a race between finding the picasa gallery and getting it into
preferences and the first get media file system call.  If so, we should probably
just fix that instead of working around it in tests.

[tommycli, 2013/09/19 22:58:45]

Done. Race fixed in a pending CL:
https://codereview.chromium.org/24269007/

Still need function to inject DeviceID, unless I make a
ScopedPicasaDeviceIDOverride. I tried that, and the result was more code than
this approach.

[vandebo (ex-Chrome), 2013/09/23 16:01:31]

Why would you need an IDOverride?  Can't you just put your fake data in the
directory that EnsureMediaDirectoriesExists creates?

[tommycli, 2013/09/24 00:42:36]

Sry, I didn't give you enough info. In the CL after this,
https://codereview.chromium.org/23456035/ , I make the Finder look in the
registry for the custom Picasa database location. If it finds something in
there, then overriding APP_LOCAL_DATA has no effect.

I tried adding a scoped override to the Finder behavior, but it was more
complicated than just overwriting the Device ID.

[vandebo (ex-Chrome), 2013/09/26 21:58:52]

Will RegistryOverrideManager do what you need?

[tommycli, 2013/09/26 22:02:15]

It would not work for Mac. I could also override the Mac preferences, but at
that point, I might as well just add a scoped override to the Finder behavior...

[vandebo (ex-Chrome), 2013/09/26 22:11:59]

I've also been working on this: https://codereview.chromium.org/19617005/

[tommycli, 2013/09/26 22:22:39]

Yeah if it was just either mac prefs or win registry, it would be clean to do
the override that way.

Seeing as how it's both OSes, the cleanest thing would probably be to just
override the finder behavior or inject in a fake device id. The only downside is
that it makes the end-to-end test no longer test the MacPref/WinRegistry
portion...

[vandebo (ex-Chrome), 2013/09/26 22:25:10]

But we don't want test to behave differently when they run on system that have
had picasa/itunes/what ever installed.  So there's a strong preference to
override everything in the EnsureMediDirectoriesExists class.

[tommycli, 2013/09/26 22:52:19]

I think the current scheme (injecting in a fake device id to a temp dir) behaves
the same on systems regardless of install history. There will be momentarily a
reference to the 'real' installed database in MediaGalleriesPreferences, but
that should be wiped out before the DataProvider gets spawned.

If we override finder behavior, it will definitely ignore previously installed
instances because the Finder will not attempt to find the 'real' installed DB
and instead just return the fake one.

+      Profile* profile,
+      const base::FilePath& database_path) {
+    base::RunLoop runloop;
+    StorageMonitor::GetInstance()->EnsureInitialized(runloop.QuitClosure());
+    runloop.Run();
+
+    MediaGalleriesPreferences* preferences =
+        g_browser_process->media_file_system_registry()->GetPreferences(
+            profile);
+
+    content::RunAllPendingInMessageLoop();
+
+    preferences->OnPicasaDeviceID(StorageInfo::MakeDeviceId(
+        StorageInfo::PICASA, database_path.AsUTF8Unsafe()));
+  }
+#endif
+
  private:
   std::string device_id_;
 };
@@ -173,3 +201,41 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata"))
       << message_;
 }
+
+#if defined(OS_WIN) || defined(OS_MACOSX)
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Picasa) {
+  EnsureMediaDirectoriesExists media_directories;
+
+  // Create Picasa metadata database directories.
+  base::ScopedTempDir metadata_root;
+  ASSERT_TRUE(metadata_root.CreateUniqueTempDir());
+  base::FilePath picasa_database_path =
+      metadata_root.path().AppendASCII(picasa::kPicasaDatabaseDirName);
+  base::FilePath picasa_temp_dir_path =
+      metadata_root.path().AppendASCII(picasa::kPicasaTempDirName);
+  ASSERT_TRUE(file_util::CreateDirectory(picasa_database_path));
+  ASSERT_TRUE(file_util::CreateDirectory(picasa_temp_dir_path));
+
+  // Create fake folder directories.
+  base::ScopedTempDir folders_root;
+  ASSERT_TRUE(folders_root.CreateUniqueTempDir());
+  base::FilePath fake_folder_1 = folders_root.path().AppendASCII("folder1");
+  base::FilePath fake_folder_2 = folders_root.path().AppendASCII("folder2");
+  ASSERT_TRUE(file_util::CreateDirectory(fake_folder_1));
+  ASSERT_TRUE(file_util::CreateDirectory(fake_folder_2));
+
+  // Write folder and album contents.
+  picasa::WriteTestAlbumTable(
+      picasa_database_path, fake_folder_1, fake_folder_2);
+  picasa::WriteTestAlbumsImagesIndex(fake_folder_1, fake_folder_2);
+  picasa::WriteJPEGHeader(fake_folder_1.AppendASCII("InBoth.jpg"));
+  picasa::WriteJPEGHeader(fake_folder_1.AppendASCII("InSecondAlbumOnly.jpg"));
+  picasa::WriteJPEGHeader(fake_folder_2.AppendASCII("InFirstAlbumOnly.jpg"));
+
+  SetMediaGalleriesPreferencesForPicasaTest(browser()->profile(),
+                                            picasa_database_path);
+
+  ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/picasa"))
+      << message_;
+}
+#endif  // defined(OS_WIN) || defined(OS_MACOSX)