Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

chrome/browser/extensions/api/management/management_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/management/management_api.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 77 matching lines @@
     ExtensionSystem* system) {
   scoped_ptr<management::ExtensionInfo> info(new management::ExtensionInfo());
   ExtensionService* service = system->extension_service();
 
   info->id = extension.id();
   info->name = extension.name();
   info->enabled = service->IsExtensionEnabled(info->id);
   info->offline_enabled = extension.offline_enabled();
   info->version = extension.VersionString();
   info->description = extension.description();
-  info->options_url = extension.options_url().spec();
+  info->options_url =
+      extensions::ManifestURL::GetOptionsPage(&extension).spec();
   info->homepage_url.reset(new std::string(
       extensions::ManifestURL::GetHomepageURL(&extension).spec()));
   info->may_disable = system->management_policy()->
       UserMayModifySettings(&extension, NULL);
   info->is_app = extension.is_app();
   if (info->is_app) {
     if (extension.is_legacy_packaged_app())
       info->type = management::ExtensionInfo::TYPE_LEGACY_PACKAGED_APP;
     else if (extension.is_hosted_app())
       info->type = management::ExtensionInfo::TYPE_HOSTED_APP;
@@ skipping 11 matching lines @@
     ExtensionPrefs* prefs = service->extension_prefs();
     if (prefs->DidExtensionEscalatePermissions(extension.id())) {
       info->disabled_reason =
           management::ExtensionInfo::DISABLED_REASON_PERMISSIONS_INCREASE;
     } else {
       info->disabled_reason =
           management::ExtensionInfo::DISABLED_REASON_UNKNOWN;
     }
   }
 
-  if (!extension.update_url().is_empty()) {
+  if (!extensions::ManifestURL::GetUpdateURL(&extension).is_empty()) {
     info->update_url.reset(new std::string(
-        extension.update_url().spec()));
+        extensions::ManifestURL::GetUpdateURL(&extension).spec()));
   }
 
   if (extension.is_app()) {
     info->app_launch_url.reset(new std::string(
         extension.GetFullLaunchURL().spec()));
   }
 
   const ExtensionIconSet::IconMap& icons = extension.icons().map();
   if (!icons.empty()) {
     info->icons.reset(new IconInfoList());
@@ skipping 535 matching lines @@
 ProfileKeyedAPIFactory<ManagementAPI>* ManagementAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(new ManagementEventRouter(profile_));
   ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
 }
 
 }  // namespace extensions