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 "chrome/common/extensions/api/extension_action/action_info.h" | 5 #include "chrome/common/extensions/api/extension_action/action_info.h" |
6 #include "chrome/common/extensions/extension_builder.h" | |
7 #include "chrome/common/extensions/extension_icon_set.h" | 6 #include "chrome/common/extensions/extension_icon_set.h" |
8 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" | 7 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
9 #include "chrome/common/extensions/value_builder.h" | |
10 #include "extensions/common/error_utils.h" | 8 #include "extensions/common/error_utils.h" |
| 9 #include "extensions/common/extension_builder.h" |
11 #include "extensions/common/manifest_constants.h" | 10 #include "extensions/common/manifest_constants.h" |
| 11 #include "extensions/common/value_builder.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
13 | 13 |
14 namespace extensions { | 14 namespace extensions { |
15 | 15 |
16 namespace errors = manifest_errors; | 16 namespace errors = manifest_errors; |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 class BrowserActionManifestTest : public ExtensionManifestTest { | 20 class BrowserActionManifestTest : public ExtensionManifestTest { |
21 }; | 21 }; |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build(); | 104 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build(); |
105 | 105 |
106 string16 error = ErrorUtils::FormatErrorMessageUTF16( | 106 string16 error = ErrorUtils::FormatErrorMessageUTF16( |
107 errors::kInvalidIconPath, "19"); | 107 errors::kInvalidIconPath, "19"); |
108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"), | 108 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"), |
109 errors::kInvalidIconPath); | 109 errors::kInvalidIconPath); |
110 } | 110 } |
111 | 111 |
112 } // namespace | 112 } // namespace |
113 } // namespace extensions | 113 } // namespace extensions |
OLD | NEW |