[MediaGalleries] Mock the app data dir on Windows/Mac

chrome/browser/media_galleries/media_galleries_test_util.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_test_util.h"
 
+#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 44 matching lines @@
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   extension_service->AddExtension(extension.get());
   extension_service->EnableExtension(extension->id());
 
   return extension;
 }
 
 EnsureMediaDirectoriesExists::EnsureMediaDirectoriesExists()
     : num_galleries_(0) {
-  Init();
-}
-
-void EnsureMediaDirectoriesExists::Init() {
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   return;
-#else
-  ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());
+#endif

[Lei Zhang, 2013/06/19 21:06:50]

Can we keep the #else, so Chrome and Android don't try to compile code they'll
never use?

[Greg Billock, 2013/06/20 05:24:52]

Done.

 
-  const int kDirectoryKeys[] = {
-    chrome::DIR_USER_MUSIC,
-    chrome::DIR_USER_PICTURES,
-    chrome::DIR_USER_VIDEOS,
-  };
+  DCHECK(fake_dir_.CreateUniqueTempDir());

[Lei Zhang, 2013/06/19 21:06:50]

Can't do things in a DCHECK.

Let's just leave the ASSERT_TRUE()s we had before. This code is only used for
testing.

[Greg Billock, 2013/06/20 05:24:52]

You're right. I always do this. It can't be ASSERT_TRUE because it's in a
constuctor, but I'll fix it.

 
-  const char* kDirectoryNames[] = {
-    "music",
-    "pictures",
-    "videos",
-  };
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  // This is to make sure the tests don't think iTunes is installed (unless
+  // we control it specifically).
+  appdir_override_.reset(new base::ScopedPathOverride(
+      base::DIR_APP_DATA, fake_dir_.path().AppendASCII("itunes")));
+#endif
 
-  for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
-    PathService::OverrideAndCreateIfNeeded(
-        kDirectoryKeys[i], fake_dir_.path().AppendASCII(kDirectoryNames[i]),
-        true /*create*/);
-    base::FilePath path;
-    if (PathService::Get(kDirectoryKeys[i], &path) &&
-        file_util::DirectoryExists(path)) {
-      ++num_galleries_;
-    }
-  }
-  ASSERT_GT(num_galleries_, 0);
-#endif
+  music_override_.reset(new base::ScopedPathOverride(
+    chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music")));
+  pictures_override_.reset(new base::ScopedPathOverride(
+    chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures")));
+  video_override_.reset(new base::ScopedPathOverride(
+    chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos")));
+  num_galleries_ = 3;
 }
 
 }  // namespace chrome