Move the parsing of "chrome_url_overrides" out of Extension.

chrome/browser/ui/webui/uber/uber_ui.cc

Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 6ab5474f05c7e5ff1bdddc43053b8a00a8574bd3..ef543f870dc58c79cee4c6ab24a131af1ac1ae6c 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -73,12 +73,14 @@ bool HasExtensionType(Profile* profile, const char* extensionType) {
 
   for (ExtensionSet::const_iterator iter = extensionSet->begin();
        iter != extensionSet->end(); ++iter) {
-    extensions::Extension::URLOverrideMap map =
-        (*iter)->GetChromeURLOverrides();
-    extensions::Extension::URLOverrideMap::const_iterator result =
-        map.find(std::string(extensionType));
-
-    if (result != map.end())
+    const extensions::URLOverrides::URLOverrideMap* map =
+        extensions::URLOverrides::GetChromeURLOverrides(*iter);
+    if (!map)
+      continue;
+    extensions::URLOverrides::URLOverrideMap::const_iterator result =
+        map->find(std::string(extensionType));
+
+    if (result != map->end())
       return true;
   }