Fix for sync case in code forcing extension updates to use https

chrome/browser/extensions/updater/extension_downloader.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/browser/extensions/updater/extension_downloader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 132 matching lines @@
     return false;
   }
 
   // If the extension updates itself from the gallery, ignore any update URL
   // data.  At the moment there is no extra data that an extension can
   // communicate to the the gallery update servers.
   std::string update_url_data;
   if (!extension.UpdatesFromGallery())
     update_url_data = delegate_->GetUpdateUrlData(extension.id());
 
-  // Make sure we use SSL for store-hosted extensions.
-  GURL update_url = extension.update_url();
-  if (extension.UpdatesFromGallery() && !update_url.SchemeIsSecure())
-    update_url = extension_urls::GetWebstoreUpdateUrl();
-
   return AddExtensionData(extension.id(), *extension.version(),
-                          extension.GetType(), update_url,
+                          extension.GetType(), extension.update_url(),
                           update_url_data);
 }
 
 bool ExtensionDownloader::AddPendingExtension(const std::string& id,
                                               const GURL& update_url) {
   // Use a zero version to ensure that a pending extension will always
   // be updated, and thus installed (assuming all extensions have
   // non-zero versions).
   Version version("0.0.0.0");
   DCHECK(version.IsValid());
@@ skipping 34 matching lines @@
                                            Extension::Type extension_type,
                                            GURL update_url,
                                            const std::string& update_url_data) {
   // Skip extensions with non-empty invalid update URLs.
   if (!update_url.is_empty() && !update_url.is_valid()) {
     LOG(WARNING) << "Extension " << id << " has invalid update url "
                  << update_url;
     return false;
   }
 
-  // Double-check that we're using https for webstore urls.
+  // Make sure we use SSL for store-hosted extensions.
   if (extension_urls::IsWebstoreUpdateUrl(update_url) &&
-      !update_url.SchemeIsSecure() &&
-      extension_urls::GetWebstoreUpdateUrl().SchemeIsSecure()) {
-    NOTREACHED() << "Refusing to send non-secure update check for " << id
-                 << " (" << update_url.spec() << ")";
-    return false;
-  }
+      !update_url.SchemeIsSecure())
+    update_url = extension_urls::GetWebstoreUpdateUrl();
 
   // Skip extensions with empty IDs.
   if (id.empty()) {
     LOG(WARNING) << "Found extension with empty ID";
     return false;
   }
 
   if (update_url.DomainIs("google.com")) {
     url_stats_.google_url_count++;
   } else if (update_url.is_empty()) {
@@ skipping 433 matching lines @@
 }
 
 void ExtensionDownloader::NotifyUpdateFound(const std::string& id) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND,
       content::NotificationService::AllBrowserContextsAndSources(),
       content::Details<const std::string>(&id));
 }
 
 }  // namespace extensions