diff options
author | andresantoso <andresantoso@chromium.org> | 2014-09-03 09:28:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 16:36:55 +0000 |
commit | be173095fb2c38f914422473535df9b2da136bb2 (patch) | |
tree | 4786e592bc0f11118c5a91561ac8c024ffe754c8 | |
parent | aa68220c9f12f483f23c568bc6962b6bc88af38b (diff) | |
download | chromium_src-be173095fb2c38f914422473535df9b2da136bb2.zip chromium_src-be173095fb2c38f914422473535df9b2da136bb2.tar.gz chromium_src-be173095fb2c38f914422473535df9b2da136bb2.tar.bz2 |
Revert of [fsp] Enable the File System Provider API for extensions. (patchset #2 id:20001 of https://codereview.chromium.org/527663002/)
Reason for revert:
Speculative revert, failed ChromiumOS browser_tests.
[1422/1422] FileSystemProviderApiTest.Extension (11555 ms)
1 test failed:
FileSystemProviderApiTest.Extension
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%282%29/builds/11812
Original issue's description:
> [fsp] Enable the File System Provider API for extensions.
>
> Previously, only apps were allowed to use this api, however most clients will
> be actually written as extensions.
>
> TEST=browser_tests: *FileSystemProvider*Extension*
> BUG=409487
>
> Committed: https://chromium.googlesource.com/chromium/src/+/4acb869459901c6fa627473bb15b8a0f6190cc11
TBR=benwells@chromium.org,kalman@chromium.org,mtomasz@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=409487
Review URL: https://codereview.chromium.org/537603002
Cr-Commit-Position: refs/heads/master@{#293148}
5 files changed, 1 insertions, 44 deletions
diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc index 717fa3d..a7381e4 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc @@ -120,10 +120,4 @@ IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, WriteFile) { << message_; } -IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Extension) { - ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/extension", - kFlagLoadAsComponent)) - << message_; -} - } // namespace extensions diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index 11c7e16..e99372d 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json @@ -559,7 +559,7 @@ }], "fileSystemProvider": { "channel": "dev", - "extension_types": ["extension", "platform_app"] + "extension_types": ["platform_app"] }, "firstRunPrivate": { "channel": "stable", diff --git a/chrome/common/extensions/docs/templates/public/extensions/fileSystemProvider.html b/chrome/common/extensions/docs/templates/public/extensions/fileSystemProvider.html deleted file mode 100644 index 8f3e547..0000000 --- a/chrome/common/extensions/docs/templates/public/extensions/fileSystemProvider.html +++ /dev/null @@ -1 +0,0 @@ -{{+partials.standard_extensions_api api:apis.extensions.fileSystemProvider intro:intros.fileSystemProvider/}} diff --git a/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json deleted file mode 100644 index b81661a..0000000 --- a/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==", - "name": "chrome.fileSystemProvider.mount in extensions", - "version": "0.1", - "manifest_version": 2, - "description": "Test for chrome.fileSystemProvider.mount() in an extension.", - "permissions": ["fileSystemProvider", "fileBrowserPrivate"], - "background": { - "persistent": false, - "scripts": [ - "chrome-extension://gfnblenhaahcnmfdbebgincjohfkbnch/test_util.js", - "test.js" - ] - } -} diff --git a/chrome/test/data/extensions/api_test/file_system_provider/extension/test.js b/chrome/test/data/extensions/api_test/file_system_provider/extension/test.js deleted file mode 100644 index e734b8b..0000000 --- a/chrome/test/data/extensions/api_test/file_system_provider/extension/test.js +++ /dev/null @@ -1,21 +0,0 @@ -// 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. - -'use strict'; - -chrome.test.runTests([ - // Tests if mounting succeeds when invoked from an extension. Note that all - // other tests are implemented as apps. - function mount() { - var onTestSuccess = chrome.test.callbackPass(); - chrome.fileSystemProvider.mount( - {fileSystemId: 'file-system-id', displayName: 'file-system-name'}, - function() { - onTestSuccess(); - }, - function(error) { - chrome.test.fail(); - }); - }, -]); |