Revert 212538 "[SystemInfo API] Rename systemInfo Memory API."

trunk/src/chrome/common/extensions/permissions/chrome_api_permissions.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 "chrome/common/extensions/permissions/chrome_api_permissions.h"
 
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/bluetooth_permission.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
@@ skipping 269 matching lines @@
       IDS_EXTENSION_PROMPT_WARNING_USB,
       PermissionMessage::kUsb },
     { APIPermission::kUsbDevice, "usbDevices",
       APIPermissionInfo::kFlagNone, 0, PermissionMessage::kNone,
       &CreateAPIPermission<UsbDevicePermission> },
     { APIPermission::kSystemIndicator, "systemIndicator",
       APIPermissionInfo::kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,
       PermissionMessage::kSystemIndicator },
     { APIPermission::kSystemCpu, "system.cpu" },
-    { APIPermission::kSystemMemory, "system.memory" },
+    { APIPermission::kSystemInfoMemory, "systemInfo.memory" },
     { APIPermission::kSystemInfoDisplay, "systemInfo.display" },
     { APIPermission::kPointerLock, "pointerLock" },
     { APIPermission::kFullscreen, "fullscreen" },
     { APIPermission::kAudio, "audio" },
   };
 
   std::vector<APIPermissionInfo*> permissions;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) {
     const PermissionRegistration& pr = PermissionsToRegister[i];
@@ skipping 11 matching lines @@
   // Register aliases.
   std::vector<PermissionsInfo::AliasInfo> aliases;
   aliases.push_back(PermissionsInfo::AliasInfo(
       "unlimitedStorage", kOldUnlimitedStoragePermission));
   aliases.push_back(PermissionsInfo::AliasInfo(
       "tabs", kWindowsPermission));
   return aliases;
 }
 
 }  // namespace extensions