Revert 170514

chrome/common/extensions/permissions/api_permission.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/permissions/api_permission.h"
 
-#include "chrome/common/extensions/permissions/bluetooth_device_permission.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "chrome/common/extensions/permissions/socket_permission.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 using extensions::APIPermission;
 using extensions::APIPermissionInfo;
 using extensions::PermissionMessage;
@@ skipping 92 matching lines @@
 APIPermission::~APIPermission() { }
 
 APIPermission::ID APIPermission::id() const {
   return info()->id();
 }
 
 const char* APIPermission::name() const {
   return info()->name();
 }
 
-std::string APIPermission::ToString() const {
-  return name();
-}
-
-bool APIPermission::ManifestEntryForbidden() const {
-  return false;
-}
-
 PermissionMessage APIPermission::GetMessage_() const {
   return info()->GetMessage_();
 }
 
 //
 // APIPermissionInfo
 //
 
 APIPermissionInfo::APIPermissionInfo(
     APIPermission::ID id,
@@ skipping 187 matching lines @@
     { APIPermission::kMediaGalleries, "mediaGalleries" },
     { APIPermission::kMediaGalleriesRead, "mediaGalleries.read" },
     { APIPermission::kMediaGalleriesAllAutoDetected,
       "mediaGalleries.allAutoDetected", kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_ALL_GALLERIES,
       PermissionMessage::kMediaGalleriesAllGalleries },
     { APIPermission::kPushMessaging, "pushMessaging", kFlagCannotBeOptional },
     { APIPermission::kBluetooth, "bluetooth", kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH,
       PermissionMessage::kBluetooth },
-    { APIPermission::kBluetoothDevice, "bluetoothDevice",
-      kFlagNone, 0, PermissionMessage::kNone,
-      &::CreateAPIPermission<BluetoothDevicePermission> },
     { APIPermission::kUsb, "usb", kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_USB,
       PermissionMessage::kUsb },
     { APIPermission::kSystemIndicator, "systemIndicator", kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,
       PermissionMessage::kSystemIndicator },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) {
     const PermissionRegistration& pr = PermissionsToRegister[i];
     info->RegisterPermission(
         pr.id, pr.name, pr.l10n_message_id,
         pr.message_id ? pr.message_id : PermissionMessage::kNone,
         pr.flags,
         pr.constructor);
   }
 
   // Register aliases.
   info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
   info->RegisterAlias("tabs", kWindowsPermission);
 }
 
 }  // namespace extensions