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

Unified Diff: content/browser/fileapi/plugin_private_file_system_backend_unittest.cc

Issue 145303002: Convert Media Galleries to use base::File (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 11 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: content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
diff --git a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
index efd0a77e5640d365fe24a6125031f36a1a2f87bd..7aafff240b444100bc7c145edf76ed67f1c787d6 100644
--- a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
+++ b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
@@ -34,8 +34,8 @@ const std::string kPlugin2("plugin2");
const fileapi::FileSystemType kType = fileapi::kFileSystemTypePluginPrivate;
const std::string kRootName = "pluginprivate";
-void DidOpenFileSystem(base::PlatformFileError* error_out,
- base::PlatformFileError error) {
+void DidOpenFileSystem(base::File::Error* error_out,
+ base::File::Error error) {
*error_out = error;
}
@@ -77,32 +77,32 @@ class PluginPrivateFileSystemBackendTest : public testing::Test {
TEST_F(PluginPrivateFileSystemBackendTest, OpenFileSystemBasic) {
const std::string filesystem_id1 = RegisterFileSystem();
- base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
+ base::File::Error error = base::File::FILE_ERROR_FAILED;
backend()->OpenPrivateFileSystem(
kOrigin, kType, filesystem_id1, kPlugin1,
fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&DidOpenFileSystem, &error));
base::RunLoop().RunUntilIdle();
- ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+ ASSERT_EQ(base::File::FILE_OK, error);
// Run this again with FAIL_IF_NONEXISTENT to see if it succeeds.
const std::string filesystem_id2 = RegisterFileSystem();
- error = base::PLATFORM_FILE_ERROR_FAILED;
+ error = base::File::FILE_ERROR_FAILED;
backend()->OpenPrivateFileSystem(
kOrigin, kType, filesystem_id2, kPlugin1,
fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT,
base::Bind(&DidOpenFileSystem, &error));
base::RunLoop().RunUntilIdle();
- ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+ ASSERT_EQ(base::File::FILE_OK, error);
const GURL root_url(
fileapi::GetIsolatedFileSystemRootURIString(
kOrigin, filesystem_id1, kRootName));
FileSystemURL file = CreateURL(root_url, "foo");
base::FilePath platform_path;
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::CreateFile(context_.get(), file));
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::GetPlatformPath(context_.get(), file,
&platform_path));
EXPECT_TRUE(base_path().AppendASCII("000").AppendASCII(kPlugin1).IsParent(
@@ -112,22 +112,22 @@ TEST_F(PluginPrivateFileSystemBackendTest, OpenFileSystemBasic) {
TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) {
// Open filesystem for kPlugin1 and kPlugin2.
const std::string filesystem_id1 = RegisterFileSystem();
- base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
+ base::File::Error error = base::File::FILE_ERROR_FAILED;
backend()->OpenPrivateFileSystem(
kOrigin, kType, filesystem_id1, kPlugin1,
fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&DidOpenFileSystem, &error));
base::RunLoop().RunUntilIdle();
- ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+ ASSERT_EQ(base::File::FILE_OK, error);
const std::string filesystem_id2 = RegisterFileSystem();
- error = base::PLATFORM_FILE_ERROR_FAILED;
+ error = base::File::FILE_ERROR_FAILED;
backend()->OpenPrivateFileSystem(
kOrigin, kType, filesystem_id2, kPlugin2,
fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&DidOpenFileSystem, &error));
base::RunLoop().RunUntilIdle();
- ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+ ASSERT_EQ(base::File::FILE_OK, error);
// Create 'foo' in kPlugin1.
const GURL root_url1(
@@ -135,7 +135,7 @@ TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) {
kOrigin, filesystem_id1, kRootName));
FileSystemURL file1 = CreateURL(root_url1, "foo");
base::FilePath platform_path;
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::CreateFile(context_.get(), file1));
EXPECT_TRUE(AsyncFileTestHelper::FileExists(
context_.get(), file1, AsyncFileTestHelper::kDontCheckSize));

Powered by Google App Engine
This is Rietveld 408576698