| Index: chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| similarity index 76%
|
| rename from chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc
|
| rename to chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| index b77092b3a03e108420e70c46b8155c0fbe2a7dbd..f19e37e201f752e26d07fa3e32f39ac23063e2bc 100644
|
| --- a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc
|
| +++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| @@ -4,13 +4,15 @@
|
|
|
| #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
|
|
| +#include "chrome/common/extensions/api/extension_action/action_info.h"
|
| +#include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace errors = extension_manifest_errors;
|
| +namespace extensions {
|
|
|
| TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {
|
| - scoped_refptr<extensions::Extension> extension(
|
| + scoped_refptr<Extension> extension(
|
| LoadAndExpectSuccess("page_action_manifest_version_2.json"));
|
| ASSERT_TRUE(extension.get());
|
| ASSERT_TRUE(extension->page_action_info());
|
| @@ -21,5 +23,7 @@ TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {
|
| EXPECT_TRUE(extension->page_action_info()->default_popup_url.is_empty());
|
|
|
| LoadAndExpectError("page_action_manifest_version_2b.json",
|
| - errors::kInvalidPageActionPopup);
|
| + extension_manifest_errors::kInvalidPageActionPopup);
|
| }
|
| +
|
| +} // namespace extensions
|
|
|