diff options
| author | reillyg <reillyg@chromium.org> | 2015-08-03 15:09:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-03 22:10:30 +0000 |
| commit | 28fd987718745889af0bf774d9fd9d58c3bb588a (patch) | |
| tree | 49edf9b1c183465bd823aea1e3c6b3bffc071e2d | |
| parent | a6029a4c1483a0cdf9501b012b62bb324f28fd34 (diff) | |
| download | chromium_src-28fd987718745889af0bf774d9fd9d58c3bb588a.zip chromium_src-28fd987718745889af0bf774d9fd9d58c3bb588a.tar.gz chromium_src-28fd987718745889af0bf774d9fd9d58c3bb588a.tar.bz2 | |
Stablize 'usb_printers' extension manifest key.
The new permissions flow for USB printers feature is trying to launch in
M-45 and I forgot to stablize this before the branch point.
BUG=484546
Review URL: https://codereview.chromium.org/1269083004
Cr-Commit-Position: refs/heads/master@{#341628}
| -rw-r--r-- | chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc | 3 | ||||
| -rw-r--r-- | extensions/common/api/_manifest_features.json | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc index b29731c..8438446 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/browser/local_discovery/pwg_raster_converter.h" #include "chrome/browser/ui/webui/print_preview/extension_printer_handler.h" -#include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/testing_profile.h" #include "components/version_info/version_info.h" #include "device/core/device_client.h" @@ -554,8 +553,6 @@ TEST_F(ExtensionPrinterHandlerTest, GetPrinters_Reset) { } TEST_F(ExtensionPrinterHandlerTest, GetUsbPrinters) { - extensions::ScopedCurrentChannel channel(version_info::Channel::DEV); - scoped_refptr<MockUsbDevice> device0 = new MockUsbDevice(0, 0, "Google", "USB Printer", ""); usb_service_.AddDevice(device0); diff --git a/extensions/common/api/_manifest_features.json b/extensions/common/api/_manifest_features.json index d00c4e3..8a5783a 100644 --- a/extensions/common/api/_manifest_features.json +++ b/extensions/common/api/_manifest_features.json @@ -271,7 +271,7 @@ "extension_types": ["platform_app"] }, "usb_printers": { - "channel": "dev", + "channel": "stable", "extension_types": ["platform_app"] }, "version": { |