5 files changed, 1 insertions, 38 deletions
diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
index 9b2e7a3..ceab6e7 100644
--- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
@@ -141,28 +141,6 @@ PermissionIDSet BluetoothManifestPermission::GetPermissions() const {
   return permissions;
 }
 
-bool BluetoothManifestPermission::HasMessages() const { return true; }
-
-PermissionMessages BluetoothManifestPermission::GetMessages() const {
-  // When modifying this function, be careful to also modify GetPermissions()
-  // above to have the same functionality.
-  DCHECK(HasMessages());
-  PermissionMessages result;
-
-  result.push_back(PermissionMessage(
-      PermissionMessage::kBluetooth,
-      l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH)));
-
-  if (!uuids_.empty()) {
-    result.push_back(
-        PermissionMessage(PermissionMessage::kBluetoothDevices,
-                          l10n_util::GetStringUTF16(
-                              IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_DEVICES)));
-  }
-
-  return result;
-}
-
 bool BluetoothManifestPermission::FromValue(const base::Value* value) {
   if (!value)
     return false;
diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
index bbf5d3a..d72b226 100644
--- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
@@ -45,8 +45,6 @@ class BluetoothManifestPermission : public ManifestPermission {
   std::string name() const override;
   std::string id() const override;
   PermissionIDSet GetPermissions() const override;
-  bool HasMessages() const override;
-  PermissionMessages GetMessages() const override;
   bool FromValue(const base::Value* value) override;
   scoped_ptr<base::Value> ToValue() const override;
   ManifestPermission* Diff(const ManifestPermission* rhs) const override;
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.cc b/extensions/common/api/sockets/sockets_manifest_permission.cc
index dccb793..a37267a 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission.cc
@@ -272,17 +272,6 @@ PermissionIDSet SocketsManifestPermission::GetPermissions() const {
   return ids;
 }
 
-bool SocketsManifestPermission::HasMessages() const {
-  bool is_empty = permissions_.empty();
-  return !is_empty;
-}
-
-PermissionMessages SocketsManifestPermission::GetMessages() const {
-  PermissionMessages messages;
-  AddSocketHostPermissions(permissions_, NULL, &messages);
-  return messages;
-}
-
 bool SocketsManifestPermission::FromValue(const base::Value* value) {
   if (!value)
     return false;
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.h b/extensions/common/api/sockets/sockets_manifest_permission.h
index b6636d2..324acd6 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.h
+++ b/extensions/common/api/sockets/sockets_manifest_permission.h
@@ -44,8 +44,6 @@ class SocketsManifestPermission : public ManifestPermission {
   std::string name() const override;
   std::string id() const override;
   PermissionIDSet GetPermissions() const override;
-  bool HasMessages() const override;
-  PermissionMessages GetMessages() const override;
   bool FromValue(const base::Value* value) override;
   scoped_ptr<base::Value> ToValue() const override;
   ManifestPermission* Diff(const ManifestPermission* rhs) const override;
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
index 4b2dbcf..ad5ba16 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
@@ -34,7 +34,7 @@ static void AssertEmptyPermission(const SocketsManifestPermission* permission) {
   EXPECT_TRUE(permission);
   EXPECT_EQ(std::string(extensions::manifest_keys::kSockets), permission->id());
   EXPECT_EQ(permission->id(), permission->name());
-  EXPECT_FALSE(permission->HasMessages());
+  EXPECT_TRUE(permission->GetPermissions().empty());
   EXPECT_EQ(0u, permission->entries().size());
 }