Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3461)

Unified Diff: chrome/browser/chromeos/file_manager/path_util_unittest.cc

Issue 677373002: Remove migation code for file manager path preference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/path_util_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/path_util_unittest.cc b/chrome/browser/chromeos/file_manager/path_util_unittest.cc
index c77d917fc1104a1bc3b35cd350a701d4b750aad0..5c3d3bda443f9c1e5d7cc63198a6ebc418fea0c9 100644
--- a/chrome/browser/chromeos/file_manager/path_util_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/path_util_unittest.cc
@@ -5,53 +5,31 @@
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/browser/download/download_prefs.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/base/testing_profile_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace file_manager {
namespace util {
namespace {
-class ProfileRelatedTest : public testing::Test {
- protected:
- ProfileRelatedTest()
- : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {
- }
-
- virtual void SetUp() override {
- ASSERT_TRUE(testing_profile_manager_.SetUp());
- }
-
- Profile* CreateProfileWithName(const std::string& name) {
- return testing_profile_manager_.CreateTestingProfile(name);
- }
-
- private:
- TestingProfileManager testing_profile_manager_;
-};
-
TEST(FileManagerPathUtilTest, MultiProfileDownloadsFolderMigration) {
TestingProfile profile;
// This looks like "/home/chronos/u-hash/Downloads" in the production
// environment.
const base::FilePath kDownloads = GetDownloadsFolderForProfile(&profile);
+ const base::FilePath kOldDownloads =
+ DownloadPrefs::GetDefaultDownloadDirectory();
base::FilePath path;
- EXPECT_TRUE(MigratePathFromOldFormat(
- &profile,
- base::FilePath::FromUTF8Unsafe("/home/chronos/user/Downloads"),
- &path));
+ EXPECT_TRUE(MigratePathFromOldFormat(&profile, kOldDownloads, &path));
EXPECT_EQ(kDownloads, path);
EXPECT_TRUE(MigratePathFromOldFormat(
&profile,
- base::FilePath::FromUTF8Unsafe("/home/chronos/user/Downloads/a/b"),
+ kOldDownloads.AppendASCII("a/b"),
&path));
EXPECT_EQ(kDownloads.AppendASCII("a/b"), path);
@@ -68,42 +46,6 @@ TEST(FileManagerPathUtilTest, MultiProfileDownloadsFolderMigration) {
&path));
}
-TEST_F(ProfileRelatedTest, MultiProfileDriveFolderMigration) {
- Profile* profile = CreateProfileWithName("user1");
-
- const base::FilePath kDrive = drive::util::GetDriveMountPointPath(profile);
- const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user1");
- ASSERT_EQ(base::FilePath::FromUTF8Unsafe("/special/drive-" + user_id_hash),
- kDrive);
-
- base::FilePath path;
-
- EXPECT_TRUE(MigratePathFromOldFormat(
- profile,
- base::FilePath::FromUTF8Unsafe("/special/drive"),
- &path));
- EXPECT_EQ(kDrive, path);
-
- EXPECT_TRUE(MigratePathFromOldFormat(
- profile,
- base::FilePath::FromUTF8Unsafe("/special/drive/a/b"),
- &path));
- EXPECT_EQ(kDrive.AppendASCII("a/b"), path);
-
- // Path already in the new format is not converted.
- EXPECT_FALSE(MigratePathFromOldFormat(
- profile,
- kDrive.AppendASCII("a/b"),
- &path));
-
- // Only the "/special/drive" path is converted.
- EXPECT_FALSE(MigratePathFromOldFormat(
- profile,
- base::FilePath::FromUTF8Unsafe("/special/notdrive"),
- &path));
-}
-
} // namespace
} // namespace util
} // namespace file_manager
« no previous file with comments | « chrome/browser/chromeos/file_manager/path_util.cc ('k') | chrome/browser/chromeos/file_manager/volume_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698