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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1030133002: Move the check for fileBrowserHandler permission to FileBrowserHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test for OS != OS_CHROMEOS. Created 5 years, 9 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 | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/chromeos/fileapi/file_system_backend.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
index 0e71d93a713f0429ab59dfa03b47405b56624171..5ee2b0c5899c377a0fd4609835165c6258b1e09a 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
@@ -572,36 +572,41 @@ TEST_F(FileManagerFileTasksComplexTest, FindFileBrowserHandlerTasks) {
// Foo.app can handle ".txt" and ".html".
// This one is an extension, and has "file_browser_handlers"
extensions::ExtensionBuilder foo_app;
- foo_app.SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Foo")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("file_browser_handlers",
- extensions::ListBuilder()
- .Append(extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder()
- .Append("filesystem:*.txt")
- .Append("filesystem:*.html")))));
+ foo_app.SetManifest(
+ extensions::DictionaryBuilder()
+ .Set("name", "Foo")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
+ .Set(
+ "file_browser_handlers",
+ extensions::ListBuilder().Append(
+ extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder()
+ .Append("filesystem:*.txt")
+ .Append("filesystem:*.html")))));
foo_app.SetID(kFooId);
extension_service_->AddExtension(foo_app.Build().get());
// Bar.app can only handle ".txt".
extensions::ExtensionBuilder bar_app;
- bar_app.SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Bar")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("file_browser_handlers",
- extensions::ListBuilder()
- .Append(extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder()
- .Append("filesystem:*.txt")))));
+ bar_app.SetManifest(
+ extensions::DictionaryBuilder()
+ .Set("name", "Bar")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
+ .Set("file_browser_handlers",
+ extensions::ListBuilder().Append(
+ extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder().Append(
+ "filesystem:*.txt")))));
bar_app.SetID(kBarId);
extension_service_->AddExtension(bar_app.Build().get());
@@ -614,14 +619,15 @@ TEST_F(FileManagerFileTasksComplexTest, FindFileBrowserHandlerTasks) {
.Set("name", "Ephemeral")
.Set("version", "1.0.0")
.Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
.Set("file_browser_handlers",
extensions::ListBuilder().Append(
extensions::DictionaryBuilder()
.Set("id", "open")
.Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder().Append(
- "filesystem:*.txt")))));
+ .Set("file_filters", extensions::ListBuilder().Append(
+ "filesystem:*.txt")))));
ephemeral_app.SetID(kEphemeralId);
scoped_refptr<extensions::Extension> built_ephemeral_app(
ephemeral_app.Build());
@@ -704,18 +710,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks) {
// Bar.app can only handle ".txt".
// This is an extension (file browser handler).
extensions::ExtensionBuilder bar_app;
- bar_app.SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Bar")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("file_browser_handlers",
- extensions::ListBuilder()
- .Append(extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder()
- .Append("filesystem:*.txt")))));
+ bar_app.SetManifest(
+ extensions::DictionaryBuilder()
+ .Set("name", "Bar")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
+ .Set("file_browser_handlers",
+ extensions::ListBuilder().Append(
+ extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder().Append(
+ "filesystem:*.txt")))));
bar_app.SetID(kBarId);
extension_service_->AddExtension(bar_app.Build().get());
@@ -793,18 +801,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks_GoogleDocument) {
// Bar.app can handle ".gdoc" files.
// This is an extension (file browser handler).
extensions::ExtensionBuilder bar_app;
- bar_app.SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Bar")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("file_browser_handlers",
- extensions::ListBuilder()
- .Append(extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder()
- .Append("filesystem:*.gdoc")))));
+ bar_app.SetManifest(
+ extensions::DictionaryBuilder()
+ .Set("name", "Bar")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
+ .Set("file_browser_handlers",
+ extensions::ListBuilder().Append(
+ extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder().Append(
+ "filesystem:*.gdoc")))));
bar_app.SetID(kBarId);
extension_service_->AddExtension(bar_app.Build().get());
@@ -812,18 +822,20 @@ TEST_F(FileManagerFileTasksComplexTest, FindAllTypesOfTasks_GoogleDocument) {
// The ID "kFileManagerAppId" used here is precisely the one that identifies
// the Chrome OS Files.app application.
extensions::ExtensionBuilder files_app;
- files_app.SetManifest(extensions::DictionaryBuilder()
- .Set("name", "Files")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("file_browser_handlers",
- extensions::ListBuilder()
- .Append(extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- extensions::ListBuilder()
- .Append("filesystem:*.gdoc")))));
+ files_app.SetManifest(
+ extensions::DictionaryBuilder()
+ .Set("name", "Files")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ extensions::ListBuilder().Append("fileBrowserHandler"))
+ .Set("file_browser_handlers",
+ extensions::ListBuilder().Append(
+ extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder().Append(
+ "filesystem:*.gdoc")))));
files_app.SetID(kFileManagerAppId);
extension_service_->AddExtension(files_app.Build().get());
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/chromeos/fileapi/file_system_backend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698