| 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 f790b2605b93a868944988cde95bd6400e6d483c..d1a5e64bc2be8d09033920baf4d7c2f7ff6be9ad 100644
|
| --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
|
| +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
|
| @@ -3,25 +3,17 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/command_line.h"
|
| -#include "base/file_path.h"
|
| -#include "base/file_util.h"
|
| -#include "base/path_service.h"
|
| #include "base/stringprintf.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_process_manager.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/extensions/platform_app_browsertest_util.h"
|
| +#include "chrome/browser/media_gallery/media_galleries_test_util.h"
|
| #include "chrome/browser/ui/browser.h"
|
| -#include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/render_view_host.h"
|
|
|
| -#if defined(OS_LINUX)
|
| -#include "base/environment.h"
|
| -#include "base/scoped_temp_dir.h"
|
| -#endif
|
| -
|
| using extensions::PlatformAppBrowserTest;
|
|
|
| namespace {
|
| @@ -54,84 +46,17 @@ class PlatformAppMediaGalleriesBrowserTest : public PlatformAppBrowserTest {
|
| }
|
| };
|
|
|
| -class EnsureMediaDirectoriesExists {
|
| - public:
|
| - EnsureMediaDirectoriesExists() : num_galleries_(0) {
|
| - Init();
|
| - }
|
| -
|
| - int num_galleries() const { return num_galleries_; }
|
| -
|
| - private:
|
| - void Init() {
|
| -#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
| - return;
|
| -#elif defined(OS_LINUX)
|
| - // On Linux, the media directories may not exist by default, so override
|
| - // the settings to point to a temp directory with the media directories.
|
| - ASSERT_TRUE(xdg_dir_.CreateUniqueTempDir());
|
| - const FilePath xdg_path = xdg_dir_.path();
|
| - const FilePath music_dir(xdg_path.Append("Megaman"));
|
| - const FilePath pictures_dir(xdg_path.Append("Pitfall"));
|
| - const FilePath videos_dir(xdg_path.Append("VVVV"));
|
| - ASSERT_TRUE(file_util::CreateDirectory(music_dir));
|
| - ASSERT_TRUE(file_util::CreateDirectory(pictures_dir));
|
| - ASSERT_TRUE(file_util::CreateDirectory(videos_dir));
|
| -
|
| - const FilePath config_file(xdg_path.Append("user-dirs.dirs"));
|
| - std::string xdg_user_dir_data = base::StringPrintf(
|
| - "XDG_MUSIC_DIR=\"%s\"\n"
|
| - "XDG_PICTURES_DIR=\"%s\"\n"
|
| - "XDG_VIDEOS_DIR=\"%s\"\n",
|
| - music_dir.value().c_str(),
|
| - pictures_dir.value().c_str(),
|
| - videos_dir.value().c_str());
|
| - ASSERT_TRUE(file_util::WriteFile(config_file,
|
| - xdg_user_dir_data.c_str(),
|
| - xdg_user_dir_data.size()));
|
| -
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| - env->SetVar("XDG_CONFIG_HOME", xdg_path.value());
|
| -
|
| - num_galleries_ = 3;
|
| -#else
|
| - const int kDirectoryKeys[] = {
|
| - chrome::DIR_USER_MUSIC,
|
| - chrome::DIR_USER_PICTURES,
|
| - chrome::DIR_USER_VIDEOS,
|
| - };
|
| -
|
| - for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
|
| - FilePath path;
|
| - if (PathService::Get(kDirectoryKeys[i], &path) &&
|
| - file_util::DirectoryExists(path)) {
|
| - ++num_galleries_;
|
| - }
|
| - }
|
| - ASSERT_GT(num_galleries_, 0);
|
| -#endif
|
| - }
|
| -
|
| -#if defined(OS_LINUX)
|
| - ScopedTempDir xdg_dir_;
|
| -#endif
|
| -
|
| - int num_galleries_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists);
|
| -};
|
| -
|
| } // namespace
|
|
|
| IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) {
|
| - EnsureMediaDirectoriesExists media_directories;
|
| + chrome::EnsureMediaDirectoriesExists media_directories;
|
| ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries"))
|
| << message_;
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest,
|
| MediaGalleriesRead) {
|
| - EnsureMediaDirectoriesExists media_directories;
|
| + chrome::EnsureMediaDirectoriesExists media_directories;
|
| ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access"))
|
| << message_;
|
| RunSecondTestPhase(media_directories.num_galleries());
|
| @@ -139,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest,
|
|
|
| IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest,
|
| MediaGalleriesNoAccess) {
|
| - EnsureMediaDirectoriesExists media_directories;
|
| + chrome::EnsureMediaDirectoriesExists media_directories;
|
| ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access"))
|
| << message_;
|
| RunSecondTestPhase(media_directories.num_galleries());
|
|
|