Revert r139371 and r138961

chrome/common/extensions/extension_constants.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/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
   url = chrome_common_net::AppendQueryParameter(url, "_wi", action);
   url = chrome_common_net::AppendQueryParameter(url, "_mt", type);
 
   return url;
 }
 
 GURL GetWebstoreItemJsonDataURL(const std::string& extension_id) {
   return GURL(GetWebstoreLaunchURL() + "/inlineinstall/detail/" + extension_id);
 }
 
+const char kGalleryUpdateHttpUrl[] =
+    "http://clients2.google.com/service/update2/crx";
 const char kGalleryUpdateHttpsUrl[] =
     "https://clients2.google.com/service/update2/crx";
 // TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS.
 const char kExtensionBlocklistUrlPrefix[] =
     "http://www.gstatic.com/chrome/extensions/blacklist";
 const char kExtensionBlocklistHttpsUrlPrefix[] =
     "https://www.gstatic.com/chrome/extensions/blacklist";
 
-GURL GetWebstoreUpdateUrl() {
+GURL GetWebstoreUpdateUrl(bool secure) {
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   if (cmdline->HasSwitch(switches::kAppsGalleryUpdateURL))
     return GURL(cmdline->GetSwitchValueASCII(switches::kAppsGalleryUpdateURL));
   else
-    return GURL(kGalleryUpdateHttpsUrl);
+    return GURL(secure ? kGalleryUpdateHttpsUrl : kGalleryUpdateHttpUrl);
 }
 
 bool IsWebstoreUpdateUrl(const GURL& update_url) {
-  GURL store_url = GetWebstoreUpdateUrl();
-  if (update_url == store_url) {
-    return true;
-  } else {
-    return (update_url.host() == store_url.host() &&
-            update_url.path() == store_url.path());
-  }
+  return update_url == GetWebstoreUpdateUrl(false) ||
+         update_url == GetWebstoreUpdateUrl(true);
 }
 
 bool IsBlacklistUpdateUrl(const GURL& url) {
   // The extension blacklist URL is returned from the update service and
   // therefore not determined by Chromium. If the location of the blacklist file
   // ever changes, we need to update this function. A DCHECK in the
   // ExtensionUpdater ensures that we notice a change. This is the full URL
   // of a blacklist:
   // http://www.gstatic.com/chrome/extensions/blacklist/l_0_0_0_7.txt
   return StartsWithASCII(url.spec(), kExtensionBlocklistUrlPrefix, true) ||
@@ skipping 52 matching lines @@
 const char kAppStateInstalled[] = "installed";
 const char kAppStateDisabled[] = "disabled";
 const char kAppStateRunning[] = "running";
 const char kAppStateCannotRun[] = "cannot_run";
 const char kAppStateReadyToRun[] = "ready_to_run";
 
 const char kAppNotificationsIncognitoError[] =
     "This API is not accessible by 'split' mode "
     "extensions in incognito windows.";
 }