Require confirmation for writable directory access.

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 741 matching lines @@
     if (skip.count(i->id())) {
       EXPECT_EQ(PermissionMessage::kNone, permission_info->message_id())
           << "unexpected message_id for " << permission_info->name();
     } else {
       EXPECT_NE(PermissionMessage::kNone, permission_info->message_id())
           << "missing message_id for " << permission_info->name();
     }
   }
 }
 
-TEST(PermissionsTest, FileSystemWritePermissionMessages) {
-  APIPermissionSet api_permissions;
-  api_permissions.insert(APIPermission::kFileSystemWrite);
-  scoped_refptr<PermissionSet> permissions(
-      new PermissionSet(api_permissions, URLPatternSet(), URLPatternSet()));
-  PermissionMessages messages =
-      permissions->GetPermissionMessages(Manifest::TYPE_PLATFORM_APP);
-  ASSERT_EQ(1u, messages.size());
-  EXPECT_EQ(PermissionMessage::kFileSystemWrite, messages[0].id());
-}
-
-TEST(PermissionsTest, FileSystemDirectoryPermissionMessages) {
-  APIPermissionSet api_permissions;
-  api_permissions.insert(APIPermission::kFileSystemDirectory);
-  scoped_refptr<PermissionSet> permissions(
-      new PermissionSet(api_permissions, URLPatternSet(), URLPatternSet()));
-  PermissionMessages messages =
-      permissions->GetPermissionMessages(Manifest::TYPE_PLATFORM_APP);
-  ASSERT_EQ(1u, messages.size());
-  EXPECT_EQ(PermissionMessage::kFileSystemDirectory, messages[0].id());
-}
-
-TEST(PermissionsTest, MergedFileSystemPermissionMessages) {
+TEST(PermissionsTest, FileSystemPermissionMessages) {
   APIPermissionSet api_permissions;
   api_permissions.insert(APIPermission::kFileSystemWrite);
   api_permissions.insert(APIPermission::kFileSystemDirectory);
   scoped_refptr<PermissionSet> permissions(
       new PermissionSet(api_permissions, URLPatternSet(), URLPatternSet()));
   PermissionMessages messages =
+      permissions->GetPermissionMessages(Manifest::TYPE_PLATFORM_APP);
+  ASSERT_EQ(2u, messages.size());
+  std::sort(messages.begin(), messages.end());
+  std::set<PermissionMessage::ID> ids;
+  for (PermissionMessages::const_iterator it = messages.begin();
+       it != messages.end(); ++it) {
+    ids.insert(it->id());
+  }
+  EXPECT_TRUE(ContainsKey(ids, PermissionMessage::kFileSystemDirectory));
+  EXPECT_TRUE(ContainsKey(ids, PermissionMessage::kFileSystemWrite));
+}
+
+TEST(PermissionsTest, HiddenFileSystemPermissionMessages) {
+  APIPermissionSet api_permissions;
+  api_permissions.insert(APIPermission::kFileSystemWrite);
+  api_permissions.insert(APIPermission::kFileSystemDirectory);
+  api_permissions.insert(APIPermission::kFileSystemWriteDirectory);
+  scoped_refptr<PermissionSet> permissions(
+      new PermissionSet(api_permissions, URLPatternSet(), URLPatternSet()));
+  PermissionMessages messages =
       permissions->GetPermissionMessages(Manifest::TYPE_PLATFORM_APP);
   ASSERT_EQ(1u, messages.size());
   EXPECT_EQ(PermissionMessage::kFileSystemWriteDirectory, messages[0].id());
 }
 
 TEST(PermissionsTest, MergedFileSystemPermissionComparison) {
   APIPermissionSet write_api_permissions;
   write_api_permissions.insert(APIPermission::kFileSystemWrite);
   scoped_refptr<PermissionSet> write_permissions(new PermissionSet(
       write_api_permissions, URLPatternSet(), URLPatternSet()));
 
   APIPermissionSet directory_api_permissions;
   directory_api_permissions.insert(APIPermission::kFileSystemDirectory);
   scoped_refptr<PermissionSet> directory_permissions(new PermissionSet(
       directory_api_permissions, URLPatternSet(), URLPatternSet()));
 
-  APIPermissionSet both_api_permissions;
-  both_api_permissions.insert(APIPermission::kFileSystemWrite);
-  both_api_permissions.insert(APIPermission::kFileSystemDirectory);
-  scoped_refptr<PermissionSet> both_permissions(new PermissionSet(
-      both_api_permissions, URLPatternSet(), URLPatternSet()));
+  APIPermissionSet write_directory_api_permissions;
+  write_directory_api_permissions.insert(
+      APIPermission::kFileSystemWriteDirectory);
+  scoped_refptr<PermissionSet> write_directory_permissions(new PermissionSet(
+      write_directory_api_permissions, URLPatternSet(), URLPatternSet()));
 
-  EXPECT_FALSE(both_permissions->HasLessPrivilegesThan(
+  EXPECT_FALSE(write_directory_permissions->HasLessPrivilegesThan(
       write_permissions, Manifest::TYPE_PLATFORM_APP));
-  EXPECT_FALSE(both_permissions->HasLessPrivilegesThan(
+  EXPECT_FALSE(write_directory_permissions->HasLessPrivilegesThan(
       directory_permissions, Manifest::TYPE_PLATFORM_APP));
   EXPECT_TRUE(write_permissions->HasLessPrivilegesThan(
       directory_permissions, Manifest::TYPE_PLATFORM_APP));
   EXPECT_TRUE(write_permissions->HasLessPrivilegesThan(
-      both_permissions, Manifest::TYPE_PLATFORM_APP));
+      write_directory_permissions, Manifest::TYPE_PLATFORM_APP));
   EXPECT_TRUE(directory_permissions->HasLessPrivilegesThan(
       write_permissions, Manifest::TYPE_PLATFORM_APP));
   EXPECT_TRUE(directory_permissions->HasLessPrivilegesThan(
-      both_permissions, Manifest::TYPE_PLATFORM_APP));
+      write_directory_permissions, Manifest::TYPE_PLATFORM_APP));
 }
 
 TEST(PermissionsTest, GetWarningMessages_ManyHosts) {
   scoped_refptr<Extension> extension;
 
   extension = LoadManifest("permissions", "many-hosts.json");
   std::vector<string16> warnings =
       PermissionsData::GetPermissionMessageStrings(extension.get());
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Access your data on encrypted.google.com and www.google.com",
@@ skipping 600 matching lines @@
 
   scoped_refptr<Extension> extension_dwr(
       LoadManifest("permissions", "web_request_all_host_permissions.json"));
   scoped_refptr<const PermissionSet> permissions_dwr(
       extension_dwr->GetActivePermissions());
 
   EXPECT_FALSE(permissions->HasLessPrivilegesThan(permissions_dwr.get(),
                                                   extension->GetType()));
 }
 }  // namespace extensions