Chromium Code Reviews| Index: chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc |
| diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc |
| index 4ee81e7a2d307d5059fe6c58f2c05bdfa0910012..6192c6e9e7835eba0b6aef0cef93f4563a094915 100644 |
| --- a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc |
| +++ b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc |
| @@ -2,21 +2,35 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
| - |
| #include "chrome/common/extensions/extension.h" |
| #include "chrome/common/extensions/extension_manifest_constants.h" |
| +#include "chrome/common/extensions/manifest_handler.h" |
| +#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
| +#include "chrome/common/extensions/manifest_url_handler.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| +namespace keys = extension_manifest_keys; |
| namespace errors = extension_manifest_errors; |
| -TEST_F(ExtensionManifestTest, DevToolsExtensions) { |
| +namespace { |
|
Yoyo Zhou
2013/01/03 23:11:44
By the way, I didn't notice this earlier - I don't
Joe Thomas
2013/01/04 00:34:59
I remove the namespace. I added that because I rem
|
| + |
| +class DevToolsPageManifestTest : public ExtensionManifestTest { |
| + virtual void SetUp() OVERRIDE { |
| + ExtensionManifestTest::SetUp(); |
| + extensions::ManifestHandler::Register(keys::kDevToolsPage, |
| + new extensions::DevToolsPageHandler); |
| + } |
| +}; |
| + |
| +TEST_F(DevToolsPageManifestTest, DevToolsExtensions) { |
| LoadAndExpectError("devtools_extension_url_invalid_type.json", |
| errors::kInvalidDevToolsPage); |
| scoped_refptr<extensions::Extension> extension; |
| extension = LoadAndExpectSuccess("devtools_extension.json"); |
| EXPECT_EQ(extension->url().spec() + "devtools.html", |
| - extension->devtools_url().spec()); |
| + extensions::ManifestURL::GetDevToolsPage(extension).spec()); |
| EXPECT_TRUE(extension->HasEffectiveAccessToAllHosts()); |
| } |
| + |
| +} // namespace |