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

trunk/src/chrome/common/extensions/permissions/permission_set_unittest.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 "base/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 630 matching lines @@
   skip.insert(APIPermission::kFullscreen);
   skip.insert(APIPermission::kIdle);
   skip.insert(APIPermission::kNotification);
   skip.insert(APIPermission::kPointerLock);
   skip.insert(APIPermission::kPower);
   skip.insert(APIPermission::kPushMessaging);
   skip.insert(APIPermission::kSessionRestore);
   skip.insert(APIPermission::kScreensaver);
   skip.insert(APIPermission::kStorage);
   skip.insert(APIPermission::kSystemCpu);
-  skip.insert(APIPermission::kSystemMemory);
+  skip.insert(APIPermission::kSystemInfoMemory);
   skip.insert(APIPermission::kSystemInfoDisplay);
   skip.insert(APIPermission::kTts);
   skip.insert(APIPermission::kUnlimitedStorage);
   skip.insert(APIPermission::kWebView);
 
   // TODO(erikkay) add a string for this permission.
   skip.insert(APIPermission::kBackground);
 
   skip.insert(APIPermission::kClipboardWrite);
 
@@ skipping 726 matching lines @@
   allowed_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_ALL, "chrome://favicon/"));
   allowed_hosts.AddPattern(
       URLPattern(URLPattern::SCHEME_ALL, "chrome://thumb/"));
   scoped_refptr<PermissionSet> permissions(
       new PermissionSet(APIPermissionSet(), allowed_hosts, URLPatternSet()));
   permissions->GetPermissionMessages(Manifest::TYPE_EXTENSION);
 }
 
 }  // namespace extensions