[Downloads] Allow acquiring dangerous download file.

chrome/browser/extensions/api/downloads/downloads_api_unittest.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 <algorithm>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
@@ skipping 1082 matching lines @@
   // result string.
   std::string error = RunFunctionAndReturnError(
       MockedGetFileIconFunction(download_item->GetTargetFilePath(),
                                 IconLoader::NORMAL,
                                 std::string()),
       args32);
   EXPECT_STREQ(download_extension_errors::kIconNotFoundError, error.c_str());
 
   // Once the download item is deleted, we should return kInvalidOperationError.
   int id = download_item->GetId();
-  download_item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
+  download_item->Remove();
   download_item = NULL;
   EXPECT_EQ(static_cast<DownloadItem*>(NULL),
             GetCurrentManager()->GetDownload(id));
   error = RunFunctionAndReturnError(new DownloadsGetFileIconFunction(), args32);
   EXPECT_STREQ(download_extension_errors::kInvalidOperationError,
                error.c_str());
 }
 
 // Test that we can acquire file icons for history downloads regardless of
 // whether they exist or not.  If the file doesn't exist we should receive a
@@ skipping 1249 matching lines @@
 
   ASSERT_TRUE(WaitFor(events::kOnDownloadChanged,
       base::StringPrintf("[{\"id\": %d,"
                          "  \"danger\": {"
                          "    \"previous\":\"safe\","
                          "    \"current\":\"file\"},"
                          "  \"dangerAccepted\": {"
                          "    \"current\":false}}]",
                          result_id)));
 
-  item->DangerousDownloadValidated();
+  item->ValidateDangerousDownload();
   ASSERT_TRUE(WaitFor(events::kOnDownloadChanged,
       base::StringPrintf("[{\"id\": %d,"
                          "  \"dangerAccepted\": {"
                          "    \"previous\":false,"
                          "    \"current\":true}}]",
                          result_id)));
   ASSERT_TRUE(WaitFor(events::kOnDownloadChanged,
       base::StringPrintf("[{\"id\": %d,"
                           "  \"state\": {"
                           "    \"previous\": \"in_progress\","
@@ skipping 1095 matching lines @@
   DownloadsApiTest() {}
   virtual ~DownloadsApiTest() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadsApiTest);
 };
 
 
 IN_PROC_BROWSER_TEST_F(DownloadsApiTest, DownloadsApiTest) {
   ASSERT_TRUE(RunExtensionTest("downloads")) << message_;
 }