Revert "Add install warning for printerProvider permission"

After discussion during final API review, it was decided to remove the install warning for chrome.printerProvider API. TEST=None BUG=None Review URL: https://codereview.chromium.org/1058653005 Cr-Commit-Position: refs/heads/master@{#323640}
hylschwy · Apr 3, 2015 · c5d4d24 · c5d4d24
1 parent ec8e54f
commit c5d4d24
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 52 deletions.
diff --git a/chrome/common/extensions/docs/templates/articles/permission_warnings.html b/chrome/common/extensions/docs/templates/articles/permission_warnings.html
@@ -367,20 +367,6 @@ <h2 id="warnings"> Warnings and their triggers </h2>
   </td>
 </tr>
 
-<tr>
-  <td style="font-weight:bold">
-    <!-- IDS_EXTENSION_PROMPT_WARNING_PRINTER_PROVIDER-->
-    Add printing destinations and access any jobs you submit to them
-  </td>
-  <td>
-    "printerProvider" permission
-  </td>
-  <td>
-    The "printerProvider" permission is required by the
-    <a href="printerProvider"><code>chrome.printerProvider</code></a> module.
-  </td>
-</tr>
-
 <tr>
   <td style="font-weight:bold">
     <!-- IDS_EXTENSION_PROMPT_WARNING_PRIVACY-->

diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
@@ -458,9 +458,6 @@ ChromePermissionMessageRule::GetAllRules() {
       {IDS_EXTENSION_PROMPT_WARNING_NATIVE_MESSAGING,
        {APIPermission::kNativeMessaging},
        {}},
-      {IDS_EXTENSION_PROMPT_WARNING_PRINTER_PROVIDER,
-       {APIPermission::kPrinterProvider},
-       {}},
       {IDS_EXTENSION_PROMPT_WARNING_PRIVACY, {APIPermission::kPrivacy}, {}},
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ,
        {APIPermission::kProcesses},

diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -663,6 +663,7 @@ TEST(PermissionsTest, PermissionMessages) {
   skip.insert(APIPermission::kOverrideEscFullscreen);
   skip.insert(APIPermission::kPointerLock);
   skip.insert(APIPermission::kPower);
+  skip.insert(APIPermission::kPrinterProvider);
   skip.insert(APIPermission::kSessions);
   skip.insert(APIPermission::kStorage);
   skip.insert(APIPermission::kSystemCpu);
@@ -1739,24 +1740,4 @@ TEST(PermissionsTest, IsPrivilegeIncrease_DeclarativeWebRequest) {
                                        extension->GetType()));
 }
 
-#if defined(OFFICIAL_BUILD)
-#define MAYBE_PrinterProviderPermission DISABLED_PrinterProviderPermission
-#else
-#define MAYBE_PrinterProviderPermission PrinterProviderPermission
-#endif
-// Failing on (official) Win trunk (http://crbug.com/471301).
-// TODO(tbarzic): Reenable this when the API goes stable.
-TEST(PermissionsTest, MAYBE_PrinterProviderPermission) {
-  scoped_refptr<Extension> extension =
-      LoadManifest("permissions", "printer_provider.json");
-  APIPermissionSet apis;
-  apis.insert(APIPermission::kPrinterProvider);
-  EXPECT_TRUE(extension->is_platform_app());
-  EXPECT_TRUE(extension->permissions_data()->HasAPIPermission(
-      APIPermission::kPrinterProvider));
-  EXPECT_TRUE(VerifyOnePermissionMessage(
-      extension->permissions_data(),
-      "Add printing destinations and access any jobs you submit to them"));
-}
-
 }  // namespace extensions
diff --git a/chrome/test/data/extensions/permissions/printer_provider.json b/chrome/test/data/extensions/permissions/printer_provider.json
diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc
@@ -98,11 +98,7 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
        IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE,
        PermissionMessage::kNetworkingPrivate},
       {APIPermission::kPower, "power"},
-      {APIPermission::kPrinterProvider,
-       "printerProvider",
-       APIPermissionInfo::kFlagNone,
-       IDS_EXTENSION_PROMPT_WARNING_PRINTER_PROVIDER,
-       PermissionMessage::kPrinterProvider},
+      {APIPermission::kPrinterProvider, "printerProvider"},
       {APIPermission::kSerial,
        "serial",
        APIPermissionInfo::kFlagNone,

diff --git a/extensions/extensions_strings.grd b/extensions/extensions_strings.grd
@@ -365,9 +365,6 @@
       <message name="IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE" desc="Permission string for Networking Private API.">
         Manage network connections
       </message>
-      <message name="IDS_EXTENSION_PROMPT_WARNING_PRINTER_PROVIDER" desc="Permission string for Printer Provider API.">
-        Add printing destinations and access any jobs you submit to them
-      </message>
       <message name="IDS_EXTENSION_PROMPT_WARNING_SERIAL" desc="Permission string for access to serial devices.">
         Access your serial devices
       </message>