Merge 53102 - Disallow syncing of extensions with third-party update URLs or ...

chrome/browser/extensions/extension_updater.cc

 // Copyright (c) 2009 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/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 217 matching lines @@
   if (id.empty()) {
     LOG(WARNING) << "Found extension with empty ID";
     return;
   }
 
   if (update_url.DomainIs("google.com")) {
     url_stats_.google_url_count++;
   } else if (update_url.is_empty()) {
     url_stats_.no_url_count++;
     // Fill in default update URL.
-    update_url = GURL(extension_urls::kGalleryUpdateURL);
+    //
+    // TODO(akalin): Figure out if we should use the HTTPS version.
+    update_url = GURL(extension_urls::kGalleryUpdateHttpUrl);
   } else {
     url_stats_.other_url_count++;
   }
 
   if (is_theme) {
     url_stats_.theme_count++;
   }
 
   DCHECK(!update_url.is_empty());
   DCHECK(update_url.is_valid());
@@ skipping 584 matching lines @@
     extension_fetcher_.reset(
         URLFetcher::Create(kExtensionFetcherId, url, URLFetcher::GET, this));
     extension_fetcher_->set_request_context(
         Profile::GetDefaultRequestContext());
     extension_fetcher_->set_load_flags(net::LOAD_DO_NOT_SEND_COOKIES |
                                        net::LOAD_DO_NOT_SAVE_COOKIES);
     extension_fetcher_->Start();
     current_extension_fetch_ = ExtensionFetch(id, url, hash, version);
   }
 }