Move the parsing of "chrome_url_overrides" out of Extension.

chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
index b7d4c0ed8f643c7ca50e7fcf13c49239cd854523..9c4185e8b4b9ae55163490a84f52769615994ef0 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc
@@ -2,14 +2,23 @@
 // 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_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;
 
-TEST_F(ExtensionManifestTest, Override) {
+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 +30,11 @@ TEST_F(ExtensionManifestTest, Override) {
 
   extension = LoadAndExpectSuccess("override_new_tab.json");
   EXPECT_EQ(extension->url().spec() + "newtab.html",
-            extension->GetChromeURLOverrides().find("newtab")->second.spec());
+            extensions::URLOverrides::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::URLOverrides::GetChromeURLOverrides(extension)->
+                find("history")->second.spec());
 }