Make DownloadHistory observe manager, items

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/json/json_reader.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
+#include "chrome/browser/history/download_persistent_store_info.h"
 #include "chrome/browser/prefs/pref_service.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 "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/download_persistent_store_info.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 // Reads |right_json| into a ListValue |left_list|; returns true if all
 // key-value pairs in in all dictionaries in |right_list| are also in the
 // corresponding dictionary in |left_list|. Ignores keys in dictionaries in
 // |left_list| that are not in the corresponding dictionary in |right_list|.
 bool ListMatches(base::ListValue* left_list, const std::string& right_json) {
   scoped_ptr<base::Value> right_value(base::JSONReader::Read(right_json));
@@ skipping 106 matching lines @@
 };
 
 // Tests that DownloadsDOMHandler detects new downloads and relays them to the
 // renderer.
 IN_PROC_BROWSER_TEST_F(DownloadsDOMHandlerTest,
     DownloadsDOMHandlerTest_Created) {
   MockDownloadsDOMHandler mddh(download_manager());
 
   GURL url = test_server()->GetURL("files/downloads/image.jpg");
   base::Time current(base::Time::Now());
-  content::DownloadPersistentStoreInfo population_entries[] = {
-    content::DownloadPersistentStoreInfo(
-        FilePath(FILE_PATH_LITERAL("/path/to/file")),
-        url,
-        GURL(""),
-        current - base::TimeDelta::FromMinutes(5),
-        current,
-        128,
-        128,
-        content::DownloadItem::COMPLETE,
-        1,
-        false),
-  };
-  std::vector<content::DownloadPersistentStoreInfo> entries(
-      population_entries, population_entries + arraysize(population_entries));
-  download_manager()->OnPersistentStoreQueryComplete(&entries);
+  download_manager()->CreateDownloadItem(
+      FilePath(FILE_PATH_LITERAL("/path/to/file")),
+      url,
+      GURL(""),
+      current - base::TimeDelta::FromMinutes(5),
+      current,
+      128,
+      128,
+      content::DownloadItem::COMPLETE,
+      false);
 
   mddh.WaitForDownloadsList();
   ASSERT_EQ(1, static_cast<int>(mddh.downloads_list()->GetSize()));
   EXPECT_TRUE(ListMatches(
       mddh.downloads_list(),
       "[{\"file_externally_removed\": false,"
       "  \"file_name\": \"file\","
       "  \"id\": 0,"
       "  \"otr\": false,"
       "  \"since_string\": \"Today\","
@@ skipping 19 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.