downloads: add the ability to undo download removal.

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/history/download_row.h"
@@ skipping 19 matching lines @@
     base::DictionaryValue* left_dict = NULL;
     base::DictionaryValue* right_dict = NULL;
     CHECK(left_list->GetDictionary(i, &left_dict));
     CHECK(right_list->GetDictionary(i, &right_dict));
     for (base::DictionaryValue::Iterator iter(*right_dict);
           !iter.IsAtEnd(); iter.Advance()) {
       base::Value* left_value = NULL;
       if (left_dict->HasKey(iter.key()) &&
           left_dict->Get(iter.key(), &left_value) &&
           !iter.value().Equals(left_value)) {
-        LOG(WARNING) << iter.key();
+        LOG(WARNING) << "key \"" << iter.key() << "\" doesn't match ("
+                     << iter.value() << " vs. " << *left_value << ")";
         return false;
       }
     }
   }
   return true;
 }
 
 // A |DownloadsDOMHandler| that doesn't use a real WebUI object, but is real in
 // all other respects.
 class MockDownloadsDOMHandler : public DownloadsDOMHandler {
@@ skipping 103 matching lines @@
         content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         content::DOWNLOAD_INTERRUPT_REASON_NONE,
         false);
 
     mock_handler_->WaitForDownloadsList();
     ASSERT_EQ(1, static_cast<int>(mock_handler_->downloads_list()->GetSize()));
     EXPECT_TRUE(ListMatches(
         mock_handler_->downloads_list(),
         "[{\"file_externally_removed\": false,"
         "  \"file_name\": \"file\","
-        "  \"id\": 1,"
+        "  \"id\": \"1\","
         "  \"otr\": false,"
         "  \"since_string\": \"Today\","
         "  \"state\": \"COMPLETE\","
         "  \"total\": 128}]"));
   }
 
  protected:
   scoped_ptr<MockDownloadsDOMHandler> mock_handler_;
 
  private:
@@ skipping 18 matching lines @@
       prefs::kAllowDeletingBrowserHistory, true);
   mock_handler_->HandleClearAll(NULL);
   mock_handler_->WaitForDownloadsList();
   EXPECT_EQ(0, static_cast<int>(mock_handler_->downloads_list()->GetSize()));
 }
 
 // Tests removing one item, both when prohibited and when allowed.
 IN_PROC_BROWSER_TEST_F(DownloadsDOMHandlerTest, RemoveOneItem) {
   DownloadAnItem();
   base::ListValue item;
-  item.AppendInteger(1);
+  item.AppendString("1");
 
   mock_handler_->reset_downloads_list();
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kAllowDeletingBrowserHistory, false);
   mock_handler_->HandleRemove(&item);
   // Removing an item only sends the new download list if anything was actually
   // removed, so force it.
   mock_handler_->ForceSendCurrentDownloads();
   mock_handler_->WaitForDownloadsList();
   ASSERT_EQ(1, static_cast<int>(mock_handler_->downloads_list()->GetSize()));
@@ skipping 10 matching lines @@
 // 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}]"));
+      "  \"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()));
 }
 
 
 // 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.