Merge 116258 - Hide downloads of extensions blacklist from web request API.

chrome/browser/extensions/extension_updater.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 749 matching lines @@
     NotifyIfFinished();
     return;
   }
 
   // Examine the parsed manifest and kick off fetches of any new crx files.
   std::vector<int> updates = DetermineUpdates(fetch_data, *results);
   for (size_t i = 0; i < updates.size(); i++) {
     const UpdateManifest::Result* update = &(results->list.at(updates[i]));
     const std::string& id = update->extension_id;
     in_progress_ids_.insert(id);
-    if (id != std::string(kBlacklistAppID))
+    if (id != std::string(kBlacklistAppID)) {
       NotifyUpdateFound(update->extension_id);
+    } else {
+      // The URL of the blacklist file is returned by the server and we need to
+      // be sure that we continue to be able to reliably detect whether a URL
+      // references a blacklist file.
+      DCHECK(extension_urls::IsBlacklistUpdateUrl(update->crx_url))
+          << update->crx_url;
+    }
     FetchUpdatedExtension(update->extension_id, update->crx_url,
         update->package_hash, update->version);
   }
 
   // If the manifest response included a <daystart> element, we want to save
   // that value for any extensions which had sent a ping in the request.
   if (fetch_data.base_url().DomainIs("google.com") &&
       results->daystart_elapsed_seconds >= 0) {
     Time daystart =
       Time::Now() - TimeDelta::FromSeconds(results->daystart_elapsed_seconds);
@@ skipping 461 matching lines @@
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.insert(*i);
 }
 
 void ExtensionUpdater::RemoveFromInProgress(const std::set<std::string>& ids) {
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.erase(*i);
 }