| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/json/json_file_value_serializer.h" | 6 #include "base/json/json_file_value_serializer.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 { "media_galleries3", true }, // all -> read|delete|all | 598 { "media_galleries3", true }, // all -> read|delete|all |
| 599 { "media_galleries4", false }, // read|all -> all | 599 { "media_galleries4", false }, // read|all -> all |
| 600 { "media_galleries5", false }, // read|copyTo|delete|all -> read|all | 600 { "media_galleries5", false }, // read|copyTo|delete|all -> read|all |
| 601 { "media_galleries6", false }, // read|all -> read|all | 601 { "media_galleries6", false }, // read|all -> read|all |
| 602 { "media_galleries7", true }, // read|delete|all -> read|copyTo|delete|all | 602 { "media_galleries7", true }, // read|delete|all -> read|copyTo|delete|all |
| 603 { "sockets1", true }, // none -> tcp:*:* | 603 { "sockets1", true }, // none -> tcp:*:* |
| 604 { "sockets2", false }, // tcp:*:* -> tcp:*:* | 604 { "sockets2", false }, // tcp:*:* -> tcp:*:* |
| 605 { "sockets3", true }, // tcp:a.com:80 -> tcp:*:* | 605 { "sockets3", true }, // tcp:a.com:80 -> tcp:*:* |
| 606 }; | 606 }; |
| 607 | 607 |
| 608 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) { | 608 for (size_t i = 0; i < arraysize(kTests); ++i) { |
| 609 scoped_refptr<Extension> old_extension( | 609 scoped_refptr<Extension> old_extension( |
| 610 LoadManifest("allow_silent_upgrade", | 610 LoadManifest("allow_silent_upgrade", |
| 611 std::string(kTests[i].base_name) + "_old.json")); | 611 std::string(kTests[i].base_name) + "_old.json")); |
| 612 scoped_refptr<Extension> new_extension( | 612 scoped_refptr<Extension> new_extension( |
| 613 LoadManifest("allow_silent_upgrade", | 613 LoadManifest("allow_silent_upgrade", |
| 614 std::string(kTests[i].base_name) + "_new.json")); | 614 std::string(kTests[i].base_name) + "_new.json")); |
| 615 | 615 |
| 616 EXPECT_TRUE(new_extension.get()) << kTests[i].base_name << "_new.json"; | 616 EXPECT_TRUE(new_extension.get()) << kTests[i].base_name << "_new.json"; |
| 617 if (!new_extension.get()) | 617 if (!new_extension.get()) |
| 618 continue; | 618 continue; |
| (...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1849 scoped_refptr<const PermissionSet> permissions_dwr( | 1849 scoped_refptr<const PermissionSet> permissions_dwr( |
| 1850 extension_dwr->permissions_data()->active_permissions()); | 1850 extension_dwr->permissions_data()->active_permissions()); |
| 1851 | 1851 |
| 1852 EXPECT_FALSE(PermissionMessageProvider::Get()-> | 1852 EXPECT_FALSE(PermissionMessageProvider::Get()-> |
| 1853 IsPrivilegeIncrease(permissions.get(), | 1853 IsPrivilegeIncrease(permissions.get(), |
| 1854 permissions_dwr.get(), | 1854 permissions_dwr.get(), |
| 1855 extension->GetType())); | 1855 extension->GetType())); |
| 1856 } | 1856 } |
| 1857 | 1857 |
| 1858 } // namespace extensions | 1858 } // namespace extensions |
| OLD | NEW |