Revert r139371 and r138961

chrome/common/extensions/extension_constants.h

Index: chrome/common/extensions/extension_constants.h
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 7b3143de13273b79a9b2f26a9932722d79412ccf..f383801793eaf2ef6088fa9711feae453c71b797 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -31,11 +31,12 @@ namespace extension_urls {
   // etc.) about an extension from the webstore as JSON.
   GURL GetWebstoreItemJsonDataURL(const std::string& extension_id);
 
-  // Return the update URL used by gallery/webstore extensions/apps.
-  GURL GetWebstoreUpdateUrl();
+  // Return the update URL used by gallery/webstore extensions/apps. The
+  // |secure| parameter will be ignored if the update URL is overriden with
+  // --apps-gallery-update-url.
+  GURL GetWebstoreUpdateUrl(bool secure);
 
-  // Returns whether the URL is the webstore update URL (just considering host
-  // and path, not scheme, query, etc.)
+  // Returns whether the URL is the webstore update URL (secure or not).
   bool IsWebstoreUpdateUrl(const GURL& update_url);
 
   // Returns true if the URL points to an extension blacklist.