| 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..afcde45ff952ab205bb97390f73fcf09cf85dfd0 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,29 @@
|
| // 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 errors = extension_manifest_errors;
|
| +class DevToolsPageManifestTest : public ExtensionManifestTest {
|
| + virtual void SetUp() OVERRIDE {
|
| + ExtensionManifestTest::SetUp();
|
| + extensions::ManifestHandler::Register(
|
| + extension_manifest_keys::kDevToolsPage,
|
| + new extensions::DevToolsPageHandler);
|
| + }
|
| +};
|
|
|
| -TEST_F(ExtensionManifestTest, DevToolsExtensions) {
|
| +TEST_F(DevToolsPageManifestTest, DevToolsExtensions) {
|
| LoadAndExpectError("devtools_extension_url_invalid_type.json",
|
| - errors::kInvalidDevToolsPage);
|
| + extension_manifest_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());
|
| }
|
|
|