Revert 170514

chrome/browser/extensions/api/permissions/permissions_api_helpers.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/browser/extensions/api/permissions/permissions_api_helpers.h"
 
 #include "base/values.h"
 #include "chrome/common/extensions/api/permissions.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/permissions/bluetooth_device_permission.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/url_pattern_set.h"
 
 using extensions::APIPermission;
 using extensions::PermissionSet;
 using extensions::PermissionsInfo;
 
 namespace extensions {
 
 using api::permissions::Permissions;
 
 namespace permissions_api_helpers {
 
 namespace {
 
 const char kInvalidOrigin[] =
     "Invalid value for origin pattern *: *";
 const char kUnknownPermissionError[] =
     "'*' is not a recognized permission.";
-const char kNonBluetoothPermissionWithArgument[] =
-    "Only the bluetoothDevice permission supports arguments.";
 
 }  // namespace
 
 scoped_ptr<Permissions> PackPermissionSet(const PermissionSet* set) {
   Permissions* permissions(new Permissions());
 
   permissions->permissions.reset(new std::vector<std::string>());
   for (APIPermissionSet::const_iterator i = set->apis().begin();
        i != set->apis().end(); ++i) {
-    permissions->permissions->push_back(i->ToString());
+    permissions->permissions->push_back(i->name());
   }
 
   permissions->origins.reset(new std::vector<std::string>());
   URLPatternSet hosts = set->explicit_hosts();
   for (URLPatternSet::const_iterator i = hosts.begin(); i != hosts.end(); ++i)
     permissions->origins->push_back(i->GetAsString());
 
   return scoped_ptr<Permissions>(permissions);
 }
 
 scoped_refptr<PermissionSet> UnpackPermissionSet(
     const Permissions& permissions, std::string* error) {
   APIPermissionSet apis;
   std::vector<std::string>* permissions_list = permissions.permissions.get();
   if (permissions_list) {
     PermissionsInfo* info = PermissionsInfo::GetInstance();
     for (std::vector<std::string>::iterator it = permissions_list->begin();
         it != permissions_list->end(); ++it) {
-      // This is a compromise: we currently can't switch to a blend of
-      // objects/strings all the way through the API. Until then, put this
-      // processing here.
-      // http://code.google.com/p/chromium/issues/detail?id=162042
-      if (it->find("|") != std::string::npos) {
-        size_t delimiter = it->find("|");
-        std::string permission_name = it->substr(0, delimiter);
-        std::string permission_arg = it->substr(delimiter + 1);
-
-        // Restrict this to the bluetoothDevice permission for now, to
-        // discourage the use of this style of permission spreading until it is
-        // better supported.
-        const APIPermissionInfo* permission_info = info->GetByID(
-            APIPermission::kBluetoothDevice);
-        if (permission_name != permission_info->name()) {
-          *error = kNonBluetoothPermissionWithArgument;
-          return NULL;
-        }
-
-        BluetoothDevicePermission *permission =
-            new BluetoothDevicePermission(permission_info);
-        permission->AddDevicesFromString(permission_arg);
-
-        apis.insert(permission);
-      } else {
-        const APIPermissionInfo* permission_info = info->GetByName(*it);
-        if (!permission_info) {
-          *error = ErrorUtils::FormatErrorMessage(
-              kUnknownPermissionError, *it);
-          return NULL;
-        }
-        apis.insert(permission_info->id());
+      const APIPermissionInfo* permission_info = info->GetByName(*it);
+      if (!permission_info) {
+        *error = ErrorUtils::FormatErrorMessage(
+            kUnknownPermissionError, *it);
+        return NULL;
       }
+      apis.insert(permission_info->id());
     }
   }
 
   URLPatternSet origins;
   if (permissions.origins.get()) {
     for (std::vector<std::string>::iterator it = permissions.origins->begin();
         it != permissions.origins->end(); ++it) {
       URLPattern origin(Extension::kValidHostPermissionSchemes);
       URLPattern::ParseResult parse_result = origin.Parse(*it);
       if (URLPattern::PARSE_SUCCESS != parse_result) {
         *error = ErrorUtils::FormatErrorMessage(
             kInvalidOrigin,
             *it,
             URLPattern::GetParseResultString(parse_result));
         return NULL;
       }
       origins.AddPattern(origin);
     }
   }
 
   return scoped_refptr<PermissionSet>(
       new PermissionSet(apis, origins, URLPatternSet()));
 }
 
 }  // namespace permissions_api
 }  // namespace extensions