Move the parsing of "chrome_url_overrides" out of Extension.

chrome/browser/extensions/api/url_overrides/url_overrides_apitest.cc

Index: chrome/browser/extensions/api/url_overrides/url_overrides_apitest.cc
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/api/url_overrides/url_overrides_apitest.cc
similarity index 89%
rename from chrome/browser/extensions/extension_override_apitest.cc
rename to chrome/browser/extensions/api/url_overrides/url_overrides_apitest.cc
index 20de1066e3d4f6490a4da1f58cc51f3208ac31ba..b0b7209d8dc9b0010aa4eba14aecb5460f09b1e8 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/api/url_overrides/url_overrides_apitest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/common/extensions/api/url_overrides/url_overrides_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
@@ -18,7 +19,7 @@
 
 using content::WebContents;
 
-class ExtensionOverrideTest : public ExtensionApiTest {
+class URLOverridesApiTest : public ExtensionApiTest {
  protected:
   bool CheckHistoryOverridesContainsNoDupes() {
     // There should be no duplicate entries in the preferences.
@@ -46,7 +47,7 @@ class ExtensionOverrideTest : public ExtensionApiTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
+IN_PROC_BROWSER_TEST_F(URLOverridesApiTest, OverrideNewtab) {
   ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
   {
     ResultCatcher catcher;
@@ -71,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
 #else
 #define MAYBE_OverrideNewtabIncognito OverrideNewtabIncognito
 #endif
-IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {
+IN_PROC_BROWSER_TEST_F(URLOverridesApiTest, MAYBE_OverrideNewtabIncognito) {
   ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
 
   // Navigate an incognito tab to the new tab page.  We should get the actual
@@ -91,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {
 #define MAYBE_OverrideHistory OverrideHistory
 #endif  // defined(OS_WIN)
 
-IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideHistory) {
+IN_PROC_BROWSER_TEST_F(URLOverridesApiTest, MAYBE_OverrideHistory) {
   ASSERT_TRUE(RunExtensionTest("override/history")) << message_;
   {
     ResultCatcher catcher;
@@ -103,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideHistory) {
 }
 
 // Regression test for http://crbug.com/41442.
-IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldNotCreateDuplicateEntries) {
+IN_PROC_BROWSER_TEST_F(URLOverridesApiTest, ShouldNotCreateDuplicateEntries) {
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("override/history"));
   ASSERT_TRUE(extension);
@@ -113,13 +114,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldNotCreateDuplicateEntries) {
   for (size_t i = 0; i < 3; ++i) {
     ExtensionWebUI::RegisterChromeURLOverrides(
         browser()->profile(),
-        extension->GetChromeURLOverrides());
+        extensions::URLOverridesInfo::GetChromeURLOverrides(extension));
   }
 
   ASSERT_TRUE(CheckHistoryOverridesContainsNoDupes());
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldCleanUpDuplicateEntries) {
+IN_PROC_BROWSER_TEST_F(URLOverridesApiTest, ShouldCleanUpDuplicateEntries) {
   // Simulate several LoadExtension() calls happening over the lifetime of
   // a preferences file without corresponding UnloadExtension() calls. This is
   // the same as the above test, except for that it is testing the case where