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 <utility> |
| 6 |
5 #include "chrome/common/extensions/api/extension_action/action_info.h" | 7 #include "chrome/common/extensions/api/extension_action/action_info.h" |
6 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" | 8 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" |
7 #include "extensions/common/constants.h" | 9 #include "extensions/common/constants.h" |
8 #include "extensions/common/error_utils.h" | 10 #include "extensions/common/error_utils.h" |
9 #include "extensions/common/extension_builder.h" | 11 #include "extensions/common/extension_builder.h" |
10 #include "extensions/common/extension_icon_set.h" | 12 #include "extensions/common/extension_icon_set.h" |
11 #include "extensions/common/manifest_constants.h" | 13 #include "extensions/common/manifest_constants.h" |
12 #include "extensions/common/value_builder.h" | 14 #include "extensions/common/value_builder.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
14 | 16 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 "default_icon", | 117 "default_icon", |
116 std::move(DictionaryBuilder() | 118 std::move(DictionaryBuilder() |
117 .Set("19", std::string()) // Invalid value. | 119 .Set("19", std::string()) // Invalid value. |
118 .Set("24", "icon24.png") | 120 .Set("24", "icon24.png") |
119 .Set("38", "icon38.png"))))) | 121 .Set("38", "icon38.png"))))) |
120 .Build(); | 122 .Build(); |
121 | 123 |
122 base::string16 error = ErrorUtils::FormatErrorMessageUTF16( | 124 base::string16 error = ErrorUtils::FormatErrorMessageUTF16( |
123 errors::kInvalidIconPath, "19"); | 125 errors::kInvalidIconPath, "19"); |
124 LoadAndExpectError( | 126 LoadAndExpectError( |
125 ManifestData(manifest_value.Pass(), "Invalid default icon"), | 127 ManifestData(std::move(manifest_value), "Invalid default icon"), |
126 errors::kInvalidIconPath); | 128 errors::kInvalidIconPath); |
127 } | 129 } |
128 | 130 |
129 } // namespace | 131 } // namespace |
130 } // namespace extensions | 132 } // namespace extensions |
OLD | NEW |