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

chrome/common/extensions/manifest_url_info.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/common/extensions/manifest_url_info.h"
 
 #include "chrome/common/extensions/extension_manifest_constants.h"
 
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 // static
 const GURL& ManifestURLInfo::GetDevToolsPage(const Extension* extension) {
   ManifestURLInfo* info = static_cast<ManifestURLInfo*>(
       extension->GetManifestData(keys::kDevToolsPage));
-
-  if (info)
-    return info->url_;
-  return GURL::EmptyGURL();
+  return info ? info->url_ : GURL::EmptyGURL();
 }
 
 // static
 const GURL ManifestURLInfo::GetHomepageURL(const Extension* extension) {
   ManifestURLInfo* info = static_cast<ManifestURLInfo*>(
       extension->GetManifestData(keys::kHomepageURL));
 
   if (info && info->url_.is_valid())
     return info->url_;
   return extension->UpdatesFromGallery() ?
       GURL(extension_urls::GetWebstoreItemDetailURLPrefix() + extension->id()) :
       GURL::EmptyGURL();
 }
 
+// static
+const GURL& ManifestURLInfo::GetUpdateURL(const Extension* extension) {

[Yoyo Zhou, 2013/01/03 23:16:00]

Since these 2 are very similar to GetDevToolsPage, you should be able to define
a common helper function.

[Joe Thomas, 2013/01/04 01:36:27]

Done.

+  ManifestURLInfo* info = static_cast<ManifestURLInfo*>(
+      extension->GetManifestData(keys::kUpdateURL));
+  return info ? info->url_ : GURL::EmptyGURL();
+}
+
+// static
+const GURL& ManifestURLInfo::GetOptionsPage(const Extension* extension) {
+  ManifestURLInfo* info = static_cast<ManifestURLInfo*>(
+      extension->GetManifestData(keys::kOptionsPage));
+  return info ? info->url_ : GURL::EmptyGURL();
+}
+
 }  // namespace extensions