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

chrome/common/extensions/update_url_handler.cc

Index: chrome/common/extensions/update_url_handler.cc
diff --git a/chrome/common/extensions/homepage_url_handler.cc b/chrome/common/extensions/update_url_handler.cc
similarity index 54%
copy from chrome/common/extensions/homepage_url_handler.cc
copy to chrome/common/extensions/update_url_handler.cc
index 3902dc308ec7d1aea90d5276be89e3628cc9e9a4..d6abbef9d981012f585890a9411cc8005557b114 100644
--- a/chrome/common/extensions/homepage_url_handler.cc
+++ b/chrome/common/extensions/update_url_handler.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/extensions/homepage_url_handler.h"
+#include "chrome/common/extensions/update_url_handler.h"
 
 #include "base/memory/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest_url_info.h"
@@ -15,31 +16,33 @@ namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
-HomepageURLHandler::HomepageURLHandler() {
+UpdateURLHandler::UpdateURLHandler() {
 }
 
-HomepageURLHandler::~HomepageURLHandler() {
+UpdateURLHandler::~UpdateURLHandler() {
 }
 
-bool HomepageURLHandler::Parse(const base::Value* value,
-                               Extension* extension,
-                               string16* error) {
+bool UpdateURLHandler::Parse(const base::Value* value,
+                             Extension* extension,
+                             string16* error) {
   scoped_ptr<ManifestURLInfo> info(new ManifestURLInfo);
-  std::string homepage_url_str;
-  if (!value->GetAsString(&homepage_url_str)) {
+  std::string tmp_update_url;
+
+  if (!value->GetAsString(&tmp_update_url)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
-        errors::kInvalidHomepageURL, "");
+        errors::kInvalidUpdateURL, "");
     return false;
   }
-  info->url_ = GURL(homepage_url_str);
+
+  info->url_ = GURL(tmp_update_url);
   if (!info->url_.is_valid() ||
-      (!info->url_.SchemeIs("http") &&
-       !info->url_.SchemeIs("https"))) {
+      info->url_.has_ref()) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
-        errors::kInvalidHomepageURL, homepage_url_str);
+        errors::kInvalidUpdateURL, tmp_update_url);
     return false;
   }
-  extension->SetManifestData(keys::kHomepageURL, info.release());
+
+  extension->SetManifestData(keys::kUpdateURL, info.release());
   return true;
 }