Stop forcing optional permission on usbDevices section

chrome/common/extensions/permissions/permissions_data_unittest.cc

 // Copyright (c) 2013 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.
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 234 matching lines @@
   // permissions.
 #if defined(OS_CHROMEOS)
   ASSERT_EQ(0u, warnings.size());
 #else
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Access all data on your computer and the websites you visit",
             UTF16ToUTF8(warnings[0]));
 #endif
 }
 
-TEST(ExtensionPermissionsTest, OptionalOnlyPermission) {
-  // Set feature current channel to dev because the only permission that must
-  // be optional (usbDevices) is only available on dev channel.
-  Feature::ScopedCurrentChannel scoped_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
-
-  scoped_refptr<Extension> extension;
-  std::string error;
-  extension = LoadManifestUnchecked("optional_only_permission",
-                                    "manifest1.json",
-                                    Manifest::INTERNAL, Extension::NO_FLAGS,
-                                    &error);
-  EXPECT_TRUE(extension == NULL);
-  ASSERT_EQ(
-      ErrorUtils::FormatErrorMessage(
-          extension_manifest_errors::kPermissionMustBeOptional,
-          "usbDevices"),
-      error);
-
-  error.clear();
-  extension = LoadManifestUnchecked("optional_only_permission",
-                                    "manifest2.json",
-                                    Manifest::INTERNAL, Extension::NO_FLAGS,
-                                    &error);
-  EXPECT_TRUE(extension != NULL);
-  EXPECT_TRUE(error.empty());
-}
-
 // Base class for testing the CanExecuteScriptOnPage and CanCaptureVisiblePage
 // methods of Extension for extensions with various permissions.
 class ExtensionScriptAndCaptureVisibleTest : public testing::Test {
  protected:
   ExtensionScriptAndCaptureVisibleTest()
       : http_url("http://www.google.com"),
         http_url_with_path("http://www.google.com/index.html"),
         https_url("https://www.google.com"),
         file_url("file:///foo/bar"),
         favicon_url("chrome://favicon/http://www.google.com"),
@@ skipping 362 matching lines @@
 
   PermissionsData::ClearTabSpecificPermissions(extension, 1);
   EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension, 1).get());
 
   EXPECT_TRUE(AllowedExclusivelyOnTab(extension, no_urls, 0));
   EXPECT_TRUE(AllowedExclusivelyOnTab(extension, no_urls, 1));
   EXPECT_TRUE(AllowedExclusivelyOnTab(extension, no_urls, 2));
 }
 
 }  // namespace extensions