downloads: break downloads.js into more classes/files.

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"
@@ skipping 43 matching lines @@
  public:
   explicit MockDownloadsDOMHandler(content::DownloadManager* dlm)
     : DownloadsDOMHandler(dlm),
       waiting_list_(false),
       waiting_updated_(false),
       manager_(nullptr) {
   }
   ~MockDownloadsDOMHandler() override {}
 
   base::ListValue* downloads_list() { return downloads_list_.get(); }
-  base::ListValue* download_updated() { return download_updated_.get(); }
+  base::DictionaryValue* download_updated() { return download_updated_.get(); }
 
   void WaitForDownloadsList() {
-    if (downloads_list_.get())
+    if (downloads_list_)
       return;
     base::AutoReset<bool> reset_waiting(&waiting_list_, true);
     content::RunMessageLoop();
   }
 
   void WaitForDownloadUpdated() {
-    if (download_updated_.get())
+    if (download_updated_)
       return;
     base::AutoReset<bool> reset_waiting(&waiting_updated_, true);
     content::RunMessageLoop();
   }
 
   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());
+  void CallUpdateAll(const base::ListValue& list) override {
+    downloads_list_.reset(list.DeepCopy());
     if (waiting_list_) {
       content::BrowserThread::PostTask(content::BrowserThread::UI,
                                        FROM_HERE,
                                        base::MessageLoop::QuitClosure());
     }
   }
 
-  void CallDownloadUpdated(const base::ListValue& download) override {
-    download_updated_.reset(download.DeepCopy());
+  void CallUpdateItem(const base::DictionaryValue& item) override {
+    download_updated_.reset(item.DeepCopy());
     if (waiting_updated_) {
       content::BrowserThread::PostTask(content::BrowserThread::UI,
                                        FROM_HERE,
                                        base::MessageLoop::QuitClosure());
     }
   }
 
   content::DownloadManager* GetMainNotifierManager() override {
     return manager_ ? manager_ : DownloadsDOMHandler::GetMainNotifierManager();
   }
 
  private:
   scoped_ptr<base::ListValue> downloads_list_;
-  scoped_ptr<base::ListValue> download_updated_;
+  scoped_ptr<base::DictionaryValue> download_updated_;
   bool waiting_list_;
   bool waiting_updated_;
   content::DownloadManager* manager_;  // weak.
 
   DISALLOW_COPY_AND_ASSIGN(MockDownloadsDOMHandler);
 };
 
 }  // namespace
 
 class DownloadsDOMHandlerTest : public InProcessBrowserTest {
@@ skipping 32 matching lines @@
         current,
         std::string(),
         std::string(),
         128,
         128,
         content::DownloadItem::COMPLETE,
         content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         content::DOWNLOAD_INTERRUPT_REASON_NONE,
         false);
 
+    mock_handler_->ForceSendCurrentDownloads();
     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\","
         "  \"otr\": false,"
         "  \"since_string\": \"Today\","
         "  \"state\": \"COMPLETE\","
@@ skipping 72 matching lines @@
   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\"}]"));
+  const base::DictionaryValue* update = mock_handler_->download_updated();
+  ASSERT_TRUE(update);
+
+  bool removed;
+  ASSERT_TRUE(update->GetBoolean("file_externally_removed", &removed));
+  EXPECT_TRUE(removed);
+
+  std::string id;
+  ASSERT_TRUE(update->GetString("id", &id));
+  EXPECT_EQ("1", id);
 
   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
@@ skipping 31 matching lines @@
 // 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.