From 30b1422a851fb2a33c635a7c79f9a9c00e7afe4c Mon Sep 17 00:00:00 2001 From: Reilly Grant Date: Tue, 4 Aug 2015 16:40:34 -0700 Subject: [PATCH] Merge M-45: 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 TBR=vitalybuka@chromium.org,asargent@chromium.org Review URL: https://codereview.chromium.org/1269083004 Cr-Commit-Position: refs/heads/master@{#341628} (cherry-picked from commit 28fd987718745889af0bf774d9fd9d58c3bb588a) Review URL: https://codereview.chromium.org/1265353002 . Cr-Commit-Position: refs/branch-heads/2454@{#227} Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390} --- .../webui/print_preview/extension_printer_handler_unittest.cc | 3 --- extensions/common/api/_manifest_features.json | 2 +- 2 files changed, 1 insertion(+), 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 2b4af172bfa7d..00b3f76e2f32b 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 "device/core/device_client.h" #include "device/usb/mock_usb_device.h" @@ -553,8 +552,6 @@ TEST_F(ExtensionPrinterHandlerTest, GetPrinters_Reset) { } TEST_F(ExtensionPrinterHandlerTest, GetUsbPrinters) { - extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV); - scoped_refptr 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 d00c4e32fef81..8a5783a9ce416 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": {