Revert r139371 and r138961

chrome/common/extensions/extension_constants.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_
 #pragma once
 
 #include <string>
 
@@ skipping 13 matching lines @@
 
   // Returns the URL leading to a search page for Web Intents. The search is
   // specific to intents with the given |action| and |type|.
   GURL GetWebstoreIntentQueryURL(const std::string& action,
                                  const std::string& type);
 
   // Returns the URL used to get webstore data (ratings, manifest, icon URL,
   // 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.
   bool IsBlacklistUpdateUrl(const GURL& url);
 
   // The greatest common prefixes of the main extensions gallery's browse and
   // download URLs.
   extern const char kGalleryBrowsePrefix[];
 }  // namespace extension_urls
 
@@ skipping 199 matching lines @@
   extern const char kAppStateRunning[];
   extern const char kAppStateCannotRun[];
   extern const char kAppStateReadyToRun[];
 
   // Error indicating that the app notifications API is not accessible by split
   // mode extensions in incognito windows.
   extern const char kAppNotificationsIncognitoError[];
 }  // extension_misc
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_