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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/child_process_security_policy_unittest.cc

Issue 318753007: Remove stale references to PlatformFile flags, errors or functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « content/browser/child_process_security_policy_impl.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_security_policy_unittest.cc
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index d5115ebe25575cd694059d506742f4fa72d1d0bf..f25adfc480d116ca4fce572c019bcefb4d086f36 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -7,7 +7,6 @@
#include "base/basictypes.h"
#include "base/files/file_path.h"
-#include "base/platform_file.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "content/public/common/url_constants.h"
#include "content/test/test_content_browser_client.h"
@@ -467,130 +466,130 @@ TEST_F(ChildProcessSecurityPolicyTest, FilePermissions) {
// Grant permissions for a file.
p->Add(kRendererID);
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
GrantPermissionsForFile(p, kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_OPEN_TRUNCATED |
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_WRITE);
+ base::File::FLAG_OPEN |
+ base::File::FLAG_OPEN_TRUNCATED |
+ base::File::FLAG_READ |
+ base::File::FLAG_WRITE);
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_OPEN_TRUNCATED |
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_OPEN_TRUNCATED |
+ base::File::FLAG_READ |
+ base::File::FLAG_WRITE));
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_CREATE));
+ base::File::FLAG_CREATE));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file, 0));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_CREATE |
- base::PLATFORM_FILE_OPEN_TRUNCATED |
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_CREATE |
+ base::File::FLAG_OPEN_TRUNCATED |
+ base::File::FLAG_READ |
+ base::File::FLAG_WRITE));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, sibling_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, parent_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, child_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, child_traversal1,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, child_traversal2,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, evil_traversal1,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, evil_traversal2,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
// CPSP doesn't allow this case for the sake of simplicity.
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, self_traversal,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
p->Remove(kRendererID);
// Grant permissions for the directory the file is in.
p->Add(kRendererID);
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
GrantPermissionsForFile(p, kRendererID, parent_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ);
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ);
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_READ |
+ base::File::FLAG_WRITE));
p->Remove(kRendererID);
// Grant permissions for the directory the file is in (with trailing '/').
p->Add(kRendererID);
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
GrantPermissionsForFile(p, kRendererID, parent_slash_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ);
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ);
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_READ |
+ base::File::FLAG_WRITE));
// Grant permissions for the file (should overwrite the permissions granted
// for the directory).
GrantPermissionsForFile(p, kRendererID, granted_file,
- base::PLATFORM_FILE_TEMPORARY);
+ base::File::FLAG_TEMPORARY);
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_TEMPORARY));
+ base::File::FLAG_TEMPORARY));
// Revoke all permissions for the file (it should inherit its permissions
// from the directory again).
p->RevokeAllPermissionsForFile(kRendererID, granted_file);
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_TEMPORARY));
+ base::File::FLAG_TEMPORARY));
p->Remove(kRendererID);
// Grant file permissions for the file to main thread renderer process,
// make sure its worker thread renderer process inherits those.
p->Add(kRendererID);
GrantPermissionsForFile(p, kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ);
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ);
EXPECT_TRUE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, granted_file,
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_WRITE));
p->AddWorker(kWorkerRendererID, kRendererID);
EXPECT_TRUE(p->HasPermissionsForFile(kWorkerRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
EXPECT_FALSE(p->HasPermissionsForFile(kWorkerRendererID, granted_file,
- base::PLATFORM_FILE_WRITE));
+ base::File::FLAG_WRITE));
p->Remove(kRendererID);
EXPECT_FALSE(p->HasPermissionsForFile(kWorkerRendererID, granted_file,
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ));
+ base::File::FLAG_OPEN |
+ base::File::FLAG_READ));
p->Remove(kWorkerRendererID);
p->Add(kRendererID);
GrantPermissionsForFile(p, kRendererID, relative_file,
- base::PLATFORM_FILE_OPEN);
+ base::File::FLAG_OPEN);
EXPECT_FALSE(p->HasPermissionsForFile(kRendererID, relative_file,
- base::PLATFORM_FILE_OPEN));
+ base::File::FLAG_OPEN));
p->Remove(kRendererID);
}
« no previous file with comments | « content/browser/child_process_security_policy_impl.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698