downloads: clicking "remove" on chrome://downloads should also hide shelf item.

chrome/browser/ui/webui/downloads_dom_handler_browsertest.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 "base/auto_reset.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
+#include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/downloads_dom_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "content/public/test/test_utils.h"
 
@@ skipping 58 matching lines @@
 
   void ForceSendCurrentDownloads() {
     ScheduleSendCurrentDownloads();
   }
 
   void reset_downloads_list() { downloads_list_.reset(); }
   void reset_download_updated() { download_updated_.reset(); }
 
   void set_manager(content::DownloadManager* manager) { manager_ = manager; }
 
+  using DownloadsDOMHandler::FinalizeRemovals;
+
  protected:
   content::WebContents* GetWebUIWebContents() override { return NULL; }
 
   void CallDownloadsList(const base::ListValue& downloads) override {
     downloads_list_.reset(downloads.DeepCopy());
     if (waiting_list_) {
       content::BrowserThread::PostTask(content::BrowserThread::UI,
                                        FROM_HERE,
                                        base::MessageLoop::QuitClosure());
     }
@@ skipping 142 matching lines @@
   EXPECT_CALL(item, GetState()).WillRepeatedly(
       testing::Return(content::DownloadItem::IN_PROGRESS));
   EXPECT_CALL(item, UpdateObservers()).Times(0);
 
   std::vector<content::DownloadItem*> items;
   items.push_back(&item);
   EXPECT_CALL(manager, GetAllDownloads(testing::_)).WillOnce(
       testing::SetArgPointee<0>(items));
 
   mock_handler_->HandleClearAll(NULL);
+  EXPECT_TRUE(DownloadItemModel(&item).ShouldShowInShelf());
 }
 
 // Tests that DownloadsDOMHandler detects new downloads and relays them to the
 // renderer.
 // crbug.com/159390: This test fails when daylight savings time ends.
 IN_PROC_BROWSER_TEST_F(DownloadsDOMHandlerTest, DownloadsRelayed) {
   DownloadAnItem();
 
   mock_handler_->WaitForDownloadUpdated();
   ASSERT_EQ(1, static_cast<int>(mock_handler_->download_updated()->GetSize()));
   EXPECT_TRUE(ListMatches(
       mock_handler_->download_updated(),
       "[{\"file_externally_removed\": true,"
       "  \"id\": \"1\"}]"));
 
   mock_handler_->reset_downloads_list();
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kAllowDeletingBrowserHistory, true);
   mock_handler_->HandleClearAll(NULL);
   mock_handler_->WaitForDownloadsList();
   EXPECT_EQ(0, static_cast<int>(mock_handler_->downloads_list()->GetSize()));
 }
 
+// Tests that DownloadsDOMHandler actually calls DownloadItem::Remove() when
+// it's closed (and removals can no longer be undone).
+IN_PROC_BROWSER_TEST_F(DownloadsDOMHandlerTest, RemoveCalledOnPageClose) {
+  content::MockDownloadManager manager;
+  mock_handler_->set_manager(&manager);
+
+  content::MockDownloadItem item;
+  EXPECT_CALL(item, GetId()).WillRepeatedly(testing::Return(1));
+  EXPECT_CALL(item, GetState()).WillRepeatedly(
+      testing::Return(content::DownloadItem::COMPLETE));
+
+  DownloadItemModel model(&item);
+  EXPECT_TRUE(model.ShouldShowInShelf());
+
+  EXPECT_CALL(manager, GetDownload(1)).WillRepeatedly(testing::Return(&item));
+
+  base::ListValue remove;
+  remove.AppendString("1");
+  EXPECT_CALL(item, UpdateObservers()).Times(1);
+  mock_handler_->HandleRemove(&remove);
+  EXPECT_FALSE(model.ShouldShowInShelf());
+
+  EXPECT_CALL(item, Remove()).Times(1);
+  // Call |mock_handler_->FinalizeRemovals()| instead of |mock_handler_.reset()|
+  // because the vtable is affected during destruction and the fake manager
+  // rigging doesn't work.
+  mock_handler_->FinalizeRemovals();
+}
 
 // TODO(benjhayden): Test the extension downloads filter for both
 // mock_handler_.downloads_list() and mock_handler_.download_updated().
 
 // TODO(benjhayden): Test incognito, both downloads_list() and that on-record
 // calls can't access off-record items.
 
 // TODO(benjhayden): Test that bad download ids incoming from the javascript are
 // dropped on the floor.
 
 // TODO(benjhayden): Test that IsTemporary() downloads are not shown.
 
 // TODO(benjhayden): Test that RemoveObserver is called on all download items,
 // including items that crossed IsTemporary() and back.