-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/chromeos/drive/file_system_util.h"
-#include "base/file_util.h"
+#include <vector>
+
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/common/chrome_constants.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_file_system_options.h"
#include "google_apis/drive/test_util.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/isolated_context.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/isolated_context.h"
namespace drive {
namespace util {
ASSERT_TRUE(testing_profile_manager_.SetUp());
}
- Profile* CreateProfileWithName(const std::string& name) {
- return testing_profile_manager_.CreateTestingProfile(
- chrome::kProfileDirPrefix + name);
+ TestingProfileManager& testing_profile_manager() {
+ return testing_profile_manager_;
}
private:
} // namespace
-TEST(FileSystemUtilTest, FilePathToDriveURL) {
- base::FilePath path;
-
- // Path with alphabets and numbers.
- path = GetDriveMyDriveRootPath().AppendASCII("foo/bar012.txt");
- EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
-
- // Path with symbols.
- path = GetDriveMyDriveRootPath().AppendASCII(
- " !\"#$%&'()*+,-.:;<=>?@[\\]^_`{|}~");
- EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
-
- // Path with '%'.
- path = GetDriveMyDriveRootPath().AppendASCII("%19%20%21.txt");
- EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
-
- // Path with multi byte characters.
- base::string16 utf16_string;
- utf16_string.push_back(0x307b); // HIRAGANA_LETTER_HO
- utf16_string.push_back(0x3052); // HIRAGANA_LETTER_GE
- path = GetDriveMyDriveRootPath().Append(
- base::FilePath::FromUTF8Unsafe(base::UTF16ToUTF8(utf16_string) + ".txt"));
- EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
-}
-
TEST_F(ProfileRelatedFileSystemUtilTest, GetDriveMountPointPath) {
- Profile* profile = CreateProfileWithName("hash1");
- EXPECT_EQ(base::FilePath::FromUTF8Unsafe("/special/drive-hash1"),
+ Profile* profile = testing_profile_manager().CreateTestingProfile("user1");
+ const std::string user_id_hash =
+ chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user1");
+ EXPECT_EQ(base::FilePath::FromUTF8Unsafe("/special/drive-" + user_id_hash),
GetDriveMountPointPath(profile));
}
TEST_F(ProfileRelatedFileSystemUtilTest, ExtractProfileFromPath) {
- Profile* profile1 = CreateProfileWithName("hash1");
- Profile* profile2 = CreateProfileWithName("hash2");
- EXPECT_EQ(profile1, ExtractProfileFromPath(
- base::FilePath::FromUTF8Unsafe("/special/drive-hash1")));
- EXPECT_EQ(profile2, ExtractProfileFromPath(
- base::FilePath::FromUTF8Unsafe("/special/drive-hash2/root/xxx")));
+ Profile* profile1 = testing_profile_manager().CreateTestingProfile("user1");
+ Profile* profile2 = testing_profile_manager().CreateTestingProfile("user2");
+ const std::string user1_id_hash =
+ chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user1");
+ const std::string user2_id_hash =
+ chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user2");
+ EXPECT_EQ(profile1,
+ ExtractProfileFromPath(base::FilePath::FromUTF8Unsafe(
+ "/special/drive-" + user1_id_hash)));
+ EXPECT_EQ(profile2,
+ ExtractProfileFromPath(base::FilePath::FromUTF8Unsafe(
+ "/special/drive-" + user2_id_hash + "/root/xxx")));
EXPECT_EQ(NULL, ExtractProfileFromPath(
base::FilePath::FromUTF8Unsafe("/special/non-drive-path")));
}
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::MessageLoop message_loop;
- scoped_refptr<fileapi::ExternalMountPoints> mount_points =
- fileapi::ExternalMountPoints::CreateRefCounted();
- scoped_refptr<fileapi::FileSystemContext> context(
- new fileapi::FileSystemContext(
+ scoped_refptr<storage::ExternalMountPoints> mount_points =
+ storage::ExternalMountPoints::CreateRefCounted();
+ scoped_refptr<storage::FileSystemContext> context(
+ new storage::FileSystemContext(
base::MessageLoopProxy::current().get(),
base::MessageLoopProxy::current().get(),
mount_points.get(),
NULL, // special_storage_policy
NULL, // quota_manager_proxy,
- ScopedVector<fileapi::FileSystemBackend>(),
- std::vector<fileapi::URLRequestAutoMountHandler>(),
+ ScopedVector<storage::FileSystemBackend>(),
+ std::vector<storage::URLRequestAutoMountHandler>(),
temp_dir_.path(), // partition_path
content::CreateAllowFileAccessOptions()));
// Type:"external" + virtual_path:"drive/foo/bar" resolves to "drive/foo/bar".
const std::string& drive_mount_name =
GetDriveMountPointPath(&profile).BaseName().AsUTF8Unsafe();
- mount_points->RegisterFileSystem(
- drive_mount_name,
- fileapi::kFileSystemTypeDrive,
- fileapi::FileSystemMountOption(),
- GetDriveMountPointPath(&profile));
+ mount_points->RegisterFileSystem(drive_mount_name,
+ storage::kFileSystemTypeDrive,
+ storage::FileSystemMountOption(),
+ GetDriveMountPointPath(&profile));
EXPECT_EQ(
base::FilePath::FromUTF8Unsafe("drive/foo/bar"),
ExtractDrivePathFromFileSystemUrl(context->CrackURL(GURL(
// Virtual mount name should not affect the extracted path.
mount_points->RevokeFileSystem(drive_mount_name);
- mount_points->RegisterFileSystem(
- "drive2",
- fileapi::kFileSystemTypeDrive,
- fileapi::FileSystemMountOption(),
- GetDriveMountPointPath(&profile));
+ mount_points->RegisterFileSystem("drive2",
+ storage::kFileSystemTypeDrive,
+ storage::FileSystemMountOption(),
+ GetDriveMountPointPath(&profile));
EXPECT_EQ(
base::FilePath::FromUTF8Unsafe("drive/foo/bar"),
ExtractDrivePathFromFileSystemUrl(context->CrackURL(GURL(
"filesystem:chrome-extension://dummy-id/external/drive2/foo/bar"))));
// Type:"external" + virtual_path:"Downloads/foo" is not a Drive path.
- mount_points->RegisterFileSystem(
- "Downloads",
- fileapi::kFileSystemTypeNativeLocal,
- fileapi::FileSystemMountOption(),
- temp_dir_.path());
+ mount_points->RegisterFileSystem("Downloads",
+ storage::kFileSystemTypeNativeLocal,
+ storage::FileSystemMountOption(),
+ temp_dir_.path());
EXPECT_EQ(
base::FilePath(),
ExtractDrivePathFromFileSystemUrl(context->CrackURL(GURL(
// Type:"isolated" + virtual_path:"isolated_id/name" mapped on a Drive path.
std::string isolated_name;
std::string isolated_id =
- fileapi::IsolatedContext::GetInstance()->RegisterFileSystemForPath(
- fileapi::kFileSystemTypeNativeForPlatformApp,
+ storage::IsolatedContext::GetInstance()->RegisterFileSystemForPath(
+ storage::kFileSystemTypeNativeForPlatformApp,
std::string(),
GetDriveMountPointPath(&profile).AppendASCII("bar/buz"),
&isolated_name);
projects / platform / framework / web / crosswalk.git / blobdiff