| Index: chrome/common/extensions/api/url_overrides/url_overrides_manifests_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc b/chrome/common/extensions/api/url_overrides/url_overrides_manifests_unittest.cc
|
| similarity index 54%
|
| rename from chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
|
| rename to chrome/common/extensions/api/url_overrides/url_overrides_manifests_unittest.cc
|
| index b7d4c0ed8f643c7ca50e7fcf13c49239cd854523..da50d2c3c03b2591ec4baaf61fedc6db66245614 100644
|
| --- a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
|
| +++ b/chrome/common/extensions/api/url_overrides/url_overrides_manifests_unittest.cc
|
| @@ -2,14 +2,28 @@
|
| // 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/api/url_overrides/url_overrides_handler.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 "testing/gtest/include/gtest/gtest.h"
|
|
|
| +namespace keys = extension_manifest_keys;
|
| namespace errors = extension_manifest_errors;
|
|
|
| -TEST_F(ExtensionManifestTest, Override) {
|
| +using extensions::Extension;
|
| +
|
| +namespace {
|
| +
|
| +class URLOverridesManifestTest : public ExtensionManifestTest {
|
| + virtual void SetUp() OVERRIDE {
|
| + ExtensionManifestTest::SetUp();
|
| + extensions::ManifestHandler::Register(keys::kChromeURLOverrides,
|
| + new extensions::URLOverridesHandler);
|
| + }
|
| +};
|
| +
|
| +TEST_F(URLOverridesManifestTest, Override) {
|
| Testcase testcases[] = {
|
| Testcase("override_newtab_and_history.json", errors::kMultipleOverrides),
|
| Testcase("override_invalid_page.json", errors::kInvalidChromeURLOverrides)
|
| @@ -21,9 +35,13 @@ TEST_F(ExtensionManifestTest, Override) {
|
|
|
| extension = LoadAndExpectSuccess("override_new_tab.json");
|
| EXPECT_EQ(extension->url().spec() + "newtab.html",
|
| - extension->GetChromeURLOverrides().find("newtab")->second.spec());
|
| + extensions::URLOverridesInfo::GetChromeURLOverrides(extension).
|
| + find("newtab")->second.spec());
|
|
|
| extension = LoadAndExpectSuccess("override_history.json");
|
| EXPECT_EQ(extension->url().spec() + "history.html",
|
| - extension->GetChromeURLOverrides().find("history")->second.spec());
|
| + extensions::URLOverridesInfo::GetChromeURLOverrides(extension).
|
| + find("history")->second.spec());
|
| }
|
| +
|
| +} // namespace
|
|
|