summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtomasz <mtomasz@chromium.org>2014-09-02 21:33:16 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-03 04:35:40 +0000
commitcda0fd0081a30ddae388d95c297e3902a6c250bf (patch)
tree584ee2060cb0b6173e008f1e32a0f1840ba7f8da
parent0107c327ff297fad57af3e10253b84862df820d1 (diff)
downloadchromium_src-cda0fd0081a30ddae388d95c297e3902a6c250bf.zip
chromium_src-cda0fd0081a30ddae388d95c297e3902a6c250bf.tar.gz
chromium_src-cda0fd0081a30ddae388d95c297e3902a6c250bf.tar.bz2
[fsp] Enable the File System Provider API on the dev channel.
The read-only version is pretty much done, so we should let developers use it on the dev channel for initial feedback. TEST=browser_tests: *FileSystemProvider* BUG=248427 Review URL: https://codereview.chromium.org/531463002 Cr-Commit-Position: refs/heads/master@{#293063}
-rw-r--r--chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc4
-rw-r--r--chrome/common/extensions/api/_permission_features.json2
2 files changed, 2 insertions, 4 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 9093fd8..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
@@ -9,9 +9,7 @@ namespace extensions {
class FileSystemProviderApiTest : public ExtensionApiTest {
public:
FileSystemProviderApiTest()
- // Set the channel to "trunk" since this API is restricted to trunk.
- : current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
- }
+ : current_channel_(chrome::VersionInfo::CHANNEL_DEV) {}
// Loads a helper testing extension.
virtual void SetUpOnMainThread() OVERRIDE {
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index d64051a..e99372d 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -558,7 +558,7 @@
]
}],
"fileSystemProvider": {
- "channel": "trunk",
+ "channel": "dev",
"extension_types": ["platform_app"]
},
"firstRunPrivate": {