Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc

Issue 11660016: Move the parsing of "chrome_url_overrides" out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch-rebased Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/extensions/manifest_url_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/extension_manifest_constants.h"
6 #include "chrome/common/extensions/manifest_handler.h"
5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 7 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
6 8 #include "chrome/common/extensions/manifest_url_handler.h"
7 #include "chrome/common/extensions/extension_manifest_constants.h"
8 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
9 10
10 namespace errors = extension_manifest_errors; 11 namespace errors = extension_manifest_errors;
11 12
12 TEST_F(ExtensionManifestTest, Override) { 13 class URLOverridesManifestTest : public ExtensionManifestTest {
14 virtual void SetUp() OVERRIDE {
15 ExtensionManifestTest::SetUp();
16 extensions::ManifestHandler::Register(keys::kChromeURLOverrides,
17 new extensions::URLOverridesHandler);
18 }
19 };
20
21 TEST_F(URLOverridesManifestTest, Override) {
13 Testcase testcases[] = { 22 Testcase testcases[] = {
14 Testcase("override_newtab_and_history.json", errors::kMultipleOverrides), 23 Testcase("override_newtab_and_history.json", errors::kMultipleOverrides),
15 Testcase("override_invalid_page.json", errors::kInvalidChromeURLOverrides) 24 Testcase("override_invalid_page.json", errors::kInvalidChromeURLOverrides)
16 }; 25 };
17 RunTestcases(testcases, arraysize(testcases), 26 RunTestcases(testcases, arraysize(testcases),
18 EXPECT_TYPE_ERROR); 27 EXPECT_TYPE_ERROR);
19 28
20 scoped_refptr<extensions::Extension> extension; 29 scoped_refptr<extensions::Extension> extension;
21 30
22 extension = LoadAndExpectSuccess("override_new_tab.json"); 31 extension = LoadAndExpectSuccess("override_new_tab.json");
23 EXPECT_EQ(extension->url().spec() + "newtab.html", 32 EXPECT_EQ(extension->url().spec() + "newtab.html",
24 extension->GetChromeURLOverrides().find("newtab")->second.spec()); 33 extensions::URLOverrides::GetChromeURLOverrides(extension).
34 find("newtab")->second.spec());
25 35
26 extension = LoadAndExpectSuccess("override_history.json"); 36 extension = LoadAndExpectSuccess("override_history.json");
27 EXPECT_EQ(extension->url().spec() + "history.html", 37 EXPECT_EQ(extension->url().spec() + "history.html",
28 extension->GetChromeURLOverrides().find("history")->second.spec()); 38 extensions::URLOverrides::GetChromeURLOverrides(extension).
39 find("history")->second.spec());
29 } 40 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/extensions/manifest_url_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698