Revert 102126 - Make cancel remove cancelled download from active queues at time of cancel.

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 883 matching lines @@
   }
 
   // DownloadManager::Observer
   virtual void ModelChanged() {
     std::vector<DownloadItem*> downloads;
     download_manager_->SearchDownloads(string16(), &downloads);
     if (downloads.empty())
       return;
 
     EXPECT_EQ(1U, downloads.size());
-    downloads.front()->Cancel();  // Don't actually need to download it.
+    downloads.front()->Cancel(false);  // Don't actually need to download it.
 
     saw_download_ = true;
     EXPECT_TRUE(waiting_);
     MessageLoopForUI::current()->Quit();
   }
 
  private:
   DownloadManager* download_manager_;
   bool saw_download_;
   bool waiting_;
@@ skipping 92 matching lines @@
   EXPECT_EQ(1, tabbed_browser->tab_count());
   ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible());
   tabbed_browser->CloseWindow();
 #endif
 
   EXPECT_EQ(1, panel_browser->tab_count());
   ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible());
 
   panel_browser->CloseWindow();
 }