Media Galleries API Picasa: Windows Custom Database Locations

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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 "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/safe_numerics.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 54 matching lines @@
 
 }  // namespace
 
 class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
  protected:
   MediaGalleriesPlatformAppBrowserTest() : test_jpg_size_(0) {}
   virtual ~MediaGalleriesPlatformAppBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     PlatformAppBrowserTest::SetUpOnMainThread();
-    ensure_media_directories_exist_.reset(new EnsureMediaDirectoriesExists);
+    ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists);
     PopulatePicturesDirectoryTestData();
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
-    ensure_media_directories_exist_.reset();
+    ensure_media_directories_exists_.reset();
     PlatformAppBrowserTest::TearDownOnMainThread();
   }
 
   bool RunMediaGalleriesTest(const std::string& extension_name) {
     base::ListValue empty_list_value;
     return RunMediaGalleriesTestWithArg(extension_name, empty_list_value);
   }
 
   bool RunMediaGalleriesTestWithArg(const std::string& extension_name,
                                     const base::ListValue& custom_arg_value) {
@@ skipping 18 matching lines @@
                     base::string16(), 0));
     content::RunAllPendingInMessageLoop();
   }
 
   void DetachFakeDevice() {
     StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
   void PopulatePicturesDirectoryTestData() {
-    if (ensure_media_directories_exist_->num_galleries() == 0)
+    if (ensure_media_directories_exists_->num_galleries() == 0)
       return;
 
     base::FilePath test_data_path =
         test_data_dir_.AppendASCII("api_test")
                       .AppendASCII("media_galleries")
                       .AppendASCII("common");
     base::FilePath write_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_PICTURES, &write_path));
 
     // Valid file, should show up in JS as a FileEntry.
     ASSERT_TRUE(base::CopyFile(test_data_path.AppendASCII("test.jpg"),
                                write_path.AppendASCII("test.jpg")));
 
     // Invalid file, should not show up as a FileEntry in JS at all.
     ASSERT_TRUE(base::CopyFile(test_data_path.AppendASCII("test.txt"),
                                write_path.AppendASCII("test.txt")));
 
     int64 file_size;
     ASSERT_TRUE(file_util::GetFileSize(test_data_path.AppendASCII("test.jpg"),
                                        &file_size));
     test_jpg_size_ = base::checked_numeric_cast<int>(file_size);
   }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
-  void PopulatePicasaTestData() {
-    // Create Picasa metadata database directories.
-    base::FilePath metadata_root;
-#if defined(OS_WIN)
-    metadata_root = ensure_media_directories_exist_->GetFakeLocalAppDataPath();
-#elif defined(OS_MACOSX)
-    metadata_root = ensure_media_directories_exist_->GetFakeAppDataPath();
-#endif
-
-    metadata_root = metadata_root.AppendASCII("Google").AppendASCII("Picasa2");
+  void PopulatePicasaTestData(const base::FilePath& metadata_root) {
     base::FilePath picasa_database_path =
         metadata_root.AppendASCII(picasa::kPicasaDatabaseDirName);
     base::FilePath picasa_temp_dir_path =
         metadata_root.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::FilePath folders_root =
-        ensure_media_directories_exist_->GetFakePicasaFoldersRootPath();
+        ensure_media_directories_exists_->GetFakePicasaFoldersRootPath();
     base::FilePath fake_folder_1 = folders_root.AppendASCII("folder1");
     base::FilePath fake_folder_2 = folders_root.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);
 
     base::FilePath test_data_path =
         test_data_dir_.AppendASCII("api_test").AppendASCII("media_galleries")
                       .AppendASCII("common");
     ASSERT_TRUE(base::CopyFile(
         test_data_path.AppendASCII("test.jpg"),
         fake_folder_1.AppendASCII("InBoth.jpg")));
     ASSERT_TRUE(base::CopyFile(
         test_data_path.AppendASCII("test.jpg"),
         fake_folder_1.AppendASCII("InSecondAlbumOnly.jpg")));
     ASSERT_TRUE(base::CopyFile(
         test_data_path.AppendASCII("test.jpg"),
         fake_folder_2.AppendASCII("InFirstAlbumOnly.jpg")));
   }
 #endif
 
   int num_galleries() const {
-    return ensure_media_directories_exist_->num_galleries();
+    return ensure_media_directories_exists_->num_galleries();
   }
 
   int test_jpg_size() const { return test_jpg_size_; }
 
+  EnsureMediaDirectoriesExists* ensure_media_directories_exists() const {
+    return ensure_media_directories_exists_.get();
+  }
+
  private:
   std::string device_id_;
   int test_jpg_size_;
-  scoped_ptr<EnsureMediaDirectoriesExists> ensure_media_directories_exist_;
+  scoped_ptr<EnsureMediaDirectoriesExists> ensure_media_directories_exists_;
 };
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        MediaGalleriesNoAccess) {
   base::ListValue custom_args;
   custom_args.AppendInteger(num_galleries());
 
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("no_access", custom_args))
       << message_;
 }
@@ skipping 45 matching lines @@
       << message_;
 
   DetachFakeDevice();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
                        GetFilesystemMetadata) {
   ASSERT_TRUE(RunMediaGalleriesTest("metadata")) << message_;
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Picasa) {
-  PopulatePicasaTestData();
+#if defined(OS_WIN)
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
+                       PicasaDefaultLocation) {
+  base::FilePath metadata_root =
+      ensure_media_directories_exists()->GetFakeLocalAppDataPath()
+      .AppendASCII("Google").AppendASCII("Picasa2");

[vandebo (ex-Chrome), 2013/10/02 15:32:46]

nit: wrapping

[tommycli, 2013/10/02 16:44:39]

Done.

+  PopulatePicasaTestData(metadata_root);
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/picasa"))
       << message_;
 }
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
+
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
+                       PicasaCustomLocation) {
+  base::ScopedTempDir fake_alternate_app_data_dir;
+  ASSERT_TRUE(fake_alternate_app_data_dir.CreateUniqueTempDir());
+  ensure_media_directories_exists()->WriteCustomPicasaAppDataPathToRegistry(
+      fake_alternate_app_data_dir.path());
+  base::FilePath metadata_root = fake_alternate_app_data_dir.path()
+      .AppendASCII("Google").AppendASCII("Picasa2");
+  PopulatePicasaTestData(metadata_root);
+  ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/picasa"))
+      << message_;
+}
+#endif  // defined(OS_WIN)
+
+#if defined(OS_MACOSX)
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
+                       PicasaDefaultLocation) {
+  base::FilePath metadata_root =
+      ensure_media_directories_exists()->GetFakeAppDataPath()
+      .AppendASCII("Google").AppendASCII("Picasa3");

[vandebo (ex-Chrome), 2013/10/02 15:32:46]

nit: wrapping

[vandebo (ex-Chrome), 2013/10/02 15:32:46]

3 vs 2? looks like the only difference between the win and mac test, combine
them with an internal ifdef.

[tommycli, 2013/10/02 16:44:39]

Done.

[tommycli, 2013/10/02 16:44:39]

Also GetFakeAppDataPath vs GetFakeLocalAppDataPath.

+  PopulatePicasaTestData(metadata_root);
+  ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/picasa"))
+      << message_;
+}
+#endif  // defined(OS_MACOSX)