| 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 <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/permissions_updater.h" | 10 #include "chrome/browser/extensions/permissions_updater.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 // the currently problematic behaviour. | 45 // the currently problematic behaviour. |
| 46 class PermissionMessagesUnittest : public testing::Test { | 46 class PermissionMessagesUnittest : public testing::Test { |
| 47 public: | 47 public: |
| 48 PermissionMessagesUnittest() | 48 PermissionMessagesUnittest() |
| 49 : message_provider_(new ChromePermissionMessageProvider()) {} | 49 : message_provider_(new ChromePermissionMessageProvider()) {} |
| 50 ~PermissionMessagesUnittest() override {} | 50 ~PermissionMessagesUnittest() override {} |
| 51 | 51 |
| 52 protected: | 52 protected: |
| 53 void CreateAndInstallAppWithPermissions(ListBuilder required_permissions, | 53 void CreateAndInstallAppWithPermissions(ListBuilder required_permissions, |
| 54 ListBuilder optional_permissions) { | 54 ListBuilder optional_permissions) { |
| 55 app_ = test_util::BuildApp(ExtensionBuilder().Pass()) | 55 app_ = test_util::BuildApp(ExtensionBuilder()) |
| 56 .MergeManifest( | 56 .MergeManifest( |
| 57 DictionaryBuilder() | 57 DictionaryBuilder() |
| 58 .Set("permissions", std::move(required_permissions)) | 58 .Set("permissions", std::move(required_permissions)) |
| 59 .Set("optional_permissions", | 59 .Set("optional_permissions", |
| 60 std::move(optional_permissions))) | 60 std::move(optional_permissions))) |
| 61 .SetID(crx_file::id_util::GenerateId("app")) | 61 .SetID(crx_file::id_util::GenerateId("app")) |
| 62 .SetLocation(Manifest::INTERNAL) | 62 .SetLocation(Manifest::INTERNAL) |
| 63 .Build(); | 63 .Build(); |
| 64 env_.GetExtensionService()->AddExtension(app_.get()); | 64 env_.GetExtensionService()->AddExtension(app_.get()); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void CreateAndInstallExtensionWithPermissions( | 67 void CreateAndInstallExtensionWithPermissions( |
| 68 ListBuilder required_permissions, | 68 ListBuilder required_permissions, |
| 69 ListBuilder optional_permissions) { | 69 ListBuilder optional_permissions) { |
| 70 app_ = test_util::BuildExtension(ExtensionBuilder().Pass()) | 70 app_ = test_util::BuildExtension(ExtensionBuilder()) |
| 71 .MergeManifest( | 71 .MergeManifest( |
| 72 DictionaryBuilder() | 72 DictionaryBuilder() |
| 73 .Set("permissions", std::move(required_permissions)) | 73 .Set("permissions", std::move(required_permissions)) |
| 74 .Set("optional_permissions", | 74 .Set("optional_permissions", |
| 75 std::move(optional_permissions))) | 75 std::move(optional_permissions))) |
| 76 .SetID(crx_file::id_util::GenerateId("extension")) | 76 .SetID(crx_file::id_util::GenerateId("extension")) |
| 77 .SetLocation(Manifest::INTERNAL) | 77 .SetLocation(Manifest::INTERNAL) |
| 78 .Build(); | 78 .Build(); |
| 79 env_.GetExtensionService()->AddExtension(app_.get()); | 79 env_.GetExtensionService()->AddExtension(app_.get()); |
| 80 } | 80 } |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 ASSERT_EQ(1U, messages.size()); | 350 ASSERT_EQ(1U, messages.size()); |
| 351 EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message()); | 351 EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message()); |
| 352 const std::vector<base::string16>& submessages = | 352 const std::vector<base::string16>& submessages = |
| 353 messages.front().submessages(); | 353 messages.front().submessages(); |
| 354 ASSERT_EQ(arraysize(kDetails), submessages.size()); | 354 ASSERT_EQ(arraysize(kDetails), submessages.size()); |
| 355 for (size_t i = 0; i < submessages.size(); i++) | 355 for (size_t i = 0; i < submessages.size(); i++) |
| 356 EXPECT_EQ(base::ASCIIToUTF16(kDetails[i]), submessages[i]); | 356 EXPECT_EQ(base::ASCIIToUTF16(kDetails[i]), submessages[i]); |
| 357 } | 357 } |
| 358 | 358 |
| 359 } // namespace extensions | 359 } // namespace extensions |
| OLD | NEW |