| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/common/pepper_permission_util.h" | 5 #include "chrome/common/pepper_permission_util.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "chrome/common/extensions/features/feature_channel.h" | 10 #include "chrome/common/extensions/features/feature_channel.h" |
| 11 #include "components/crx_file/id_util.h" | 11 #include "components/crx_file/id_util.h" |
| 12 #include "components/version_info/version_info.h" |
| 12 #include "extensions/common/extension_builder.h" | 13 #include "extensions/common/extension_builder.h" |
| 13 #include "extensions/common/extension_set.h" | 14 #include "extensions/common/extension_set.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 16 |
| 16 using chrome::IsExtensionOrSharedModuleWhitelisted; | 17 using chrome::IsExtensionOrSharedModuleWhitelisted; |
| 17 | 18 |
| 18 namespace extensions { | 19 namespace extensions { |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| 21 | 22 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 GURL(not_in_sm_whitelist_url), &extensions, whitelist)); | 131 GURL(not_in_sm_whitelist_url), &extensions, whitelist)); |
| 131 | 132 |
| 132 // Note that the whitelist should be empty after this call, so tests checking | 133 // Note that the whitelist should be empty after this call, so tests checking |
| 133 // for failure to import will fail because of this. | 134 // for failure to import will fail because of this. |
| 134 whitelist.erase(shared_module->id()); | 135 whitelist.erase(shared_module->id()); |
| 135 EXPECT_FALSE(IsExtensionOrSharedModuleWhitelisted( | 136 EXPECT_FALSE(IsExtensionOrSharedModuleWhitelisted( |
| 136 GURL(extension_url), &extensions, whitelist)); | 137 GURL(extension_url), &extensions, whitelist)); |
| 137 } | 138 } |
| 138 | 139 |
| 139 } // namespace extensions | 140 } // namespace extensions |
| OLD | NEW |