[Downloads] Always call DM::StartDownload() for explicit downloads.

chrome/browser/extensions/api/downloads/downloads_api_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.
 
 // Disable everything on windows only. http://crbug.com/306144
 #ifndef OS_WIN
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 13 matching lines @@
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_test_file_activity_observer.h"
 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/common/extensions/api/downloads.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 "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
@@ skipping 1724 matching lines @@
   };
 
   for (size_t index = 0; index < arraysize(kInvalidURLs); ++index) {
     EXPECT_STREQ(errors::kInvalidURL,
                   RunFunctionAndReturnError(new DownloadsDownloadFunction(),
                                             base::StringPrintf(
         "[{\"url\": \"%s\"}]", kInvalidURLs[index])).c_str())
       << kInvalidURLs[index];
   }
 
-  EXPECT_STREQ("NETWORK_INVALID_REQUEST", RunFunctionAndReturnError(
+  int result_id = -1;
+  scoped_ptr<base::Value> result(RunFunctionAndReturnResult(
       new DownloadsDownloadFunction(),
-      "[{\"url\": \"javascript:document.write(\\\"hello\\\");\"}]").c_str());
-  EXPECT_STREQ("NETWORK_INVALID_REQUEST", RunFunctionAndReturnError(
+      "[{\"url\": \"javascript:document.write(\\\"hello\\\");\"}]"));
+  ASSERT_TRUE(result.get());
+  ASSERT_TRUE(result->GetAsInteger(&result_id));
+  DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
+  ASSERT_TRUE(item);
+  ASSERT_TRUE(
+      WaitFor(downloads::OnCreated::kEventName,
+              "[{\"error\": \"NETWORK_INVALID_REQUEST\","
+              "  \"state\": \"interrupted\","
+              "  \"url\": \"javascript:document.write(\\\"hello\\\");\"}]"));
+
+  result.reset(
+      RunFunctionAndReturnResult(new DownloadsDownloadFunction(),
+                                 "[{\"url\": \"javascript:return false;\"}]"));
+  ASSERT_TRUE(result.get());
+  ASSERT_TRUE(result->GetAsInteger(&result_id));
+  item = GetCurrentManager()->GetDownload(result_id);
+  ASSERT_TRUE(item);
+  ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
+                      "[{\"error\": \"NETWORK_INVALID_REQUEST\","
+                      "  \"state\": \"interrupted\","
+                      "  \"url\": \"javascript:return false;\"}]"));
+
+  result.reset(RunFunctionAndReturnResult(
       new DownloadsDownloadFunction(),
-      "[{\"url\": \"javascript:return false;\"}]").c_str());
-  EXPECT_STREQ("NETWORK_FAILED", RunFunctionAndReturnError(
-      new DownloadsDownloadFunction(),
-      "[{\"url\": \"ftp://example.com/example.txt\"}]").c_str());
+      "[{\"url\": \"ftp://example.com/example.txt\"}]"));
+  ASSERT_TRUE(result.get());
+  ASSERT_TRUE(result->GetAsInteger(&result_id));
+  item = GetCurrentManager()->GetDownload(result_id);
+  ASSERT_TRUE(item);
+  ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
+                      "[{\"error\": \"NETWORK_FAILED\","
+                      "  \"state\": \"interrupted\","
+                      "  \"url\": \"ftp://example.com/example.txt\"}]"));
 }
 
 // TODO(benjhayden): Set up a test ftp server, add ftp://localhost* to
 // permissions, test downloading from ftp.
 
 // Valid URLs plus fragments are still valid URLs.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_URLFragment) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
@@ skipping 232 matching lines @@
       "[{\"url\": \"%s\","
       "  \"filename\": \"auth-basic-fail.txt\"}]",
       download_url.c_str())));
   ASSERT_TRUE(result.get());
   int result_id = -1;
   ASSERT_TRUE(result->GetAsInteger(&result_id));
   DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
-
-  ASSERT_TRUE(WaitForInterruption(
-      item,
-      content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED,
-      base::StringPrintf("[{\"danger\": \"safe\","
-                         "  \"incognito\": false,"
-                         "  \"mime\": \"text/html\","
-                         "  \"paused\": false,"
-                         "  \"url\": \"%s\"}]",
-                         download_url.c_str())));
+  ASSERT_TRUE(
+      WaitFor(downloads::OnCreated::kEventName,
+              base::StringPrintf("[{\"url\": \"%s\","
+                                 "  \"state\": \"interrupted\","
+                                 "  \"error\": \"SERVER_UNAUTHORIZED\"}]",
+                                 download_url.c_str())));
 }
 
 // Test that DownloadsDownloadFunction propagates |headers| to the URLRequest.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Headers) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
   std::string download_url =
       embedded_test_server()
           ->GetURL(
@@ skipping 64 matching lines @@
       "[{\"url\": \"%s\","
       "  \"filename\": \"headers-fail.txt\"}]",
       download_url.c_str())));
   ASSERT_TRUE(result.get());
   int result_id = -1;
   ASSERT_TRUE(result->GetAsInteger(&result_id));
   DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
-
-  ASSERT_TRUE(WaitForInterruption(
-      item,
-      content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
-      base::StringPrintf("[{\"danger\": \"safe\","
-                         "  \"incognito\": false,"
-                         "  \"bytesReceived\": 0.0,"
-                         "  \"fileSize\": 0.0,"
-                         "  \"mime\": \"\","
-                         "  \"paused\": false,"
-                         "  \"url\": \"%s\"}]",
-                         download_url.c_str())));
+  ASSERT_TRUE(
+      WaitFor(downloads::OnCreated::kEventName,
+              base::StringPrintf("[{\"url\": \"%s\","
+                                 "  \"state\": \"interrupted\","
+                                 "  \"error\": \"SERVER_BAD_CONTENT\"}]",
+                                 download_url.c_str())));
 }
 
 // Test that DownloadsDownloadFunction propagates the Authorization header
 // correctly.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_AuthBasic) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
   std::string download_url =
       embedded_test_server()->GetURL("/auth-basic").spec();
@@ skipping 110 matching lines @@
       "  \"body\": \"BODY\","
       "  \"filename\": \"post-get.txt\"}]",
       download_url.c_str())));
   ASSERT_TRUE(result.get());
   int result_id = -1;
   ASSERT_TRUE(result->GetAsInteger(&result_id));
   DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
-
-  ASSERT_TRUE(WaitForInterruption(
-      item,
-      content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
-      base::StringPrintf("[{\"danger\": \"safe\","
-                         "  \"incognito\": false,"
-                         "  \"mime\": \"\","
-                         "  \"paused\": false,"
-                         "  \"id\": %d,"
-                         "  \"url\": \"%s\"}]",
-                         result_id,
-                         download_url.c_str())));
+  ASSERT_TRUE(
+      WaitFor(downloads::OnCreated::kEventName,
+              base::StringPrintf("[{\"url\": \"%s\","
+                                 "  \"state\": \"interrupted\","
+                                 "  \"error\": \"SERVER_BAD_CONTENT\"}]",
+                                 download_url.c_str())));
 }
 
 // Test that downloadPostSuccess would fail if the resource requires the POST
 // method, and chrome fails to propagate the |body| parameter back to the
 // server. This tests both that testserver.py does not succeed when it should
 // fail, and this tests how the downloads extension api exposes the failure to
 // extensions.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Post_NoBody) {
   LoadExtension("downloads_split");
@@ skipping 11 matching lines @@
       "  \"method\": \"POST\","
       "  \"filename\": \"post-nobody.txt\"}]",
       download_url.c_str())));
   ASSERT_TRUE(result.get());
   int result_id = -1;
   ASSERT_TRUE(result->GetAsInteger(&result_id));
   DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
-
-  ASSERT_TRUE(WaitForInterruption(
-      item,
-      content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
-      base::StringPrintf("[{\"danger\": \"safe\","
-                         "  \"incognito\": false,"
-                         "  \"mime\": \"\","
-                         "  \"paused\": false,"
-                         "  \"id\": %d,"
-                         "  \"url\": \"%s\"}]",
-                         result_id,
-                         download_url.c_str())));
+  ASSERT_TRUE(
+      WaitFor(downloads::OnCreated::kEventName,
+              base::StringPrintf("[{\"url\": \"%s\","
+                                 "  \"state\": \"interrupted\","
+                                 "  \"error\": \"SERVER_BAD_CONTENT\"}]",
+                                 download_url.c_str())));
 }
 
 // Test that cancel()ing an in-progress download causes its state to transition
 // to interrupted, and test that that state transition is detectable by an
 // onChanged event listener.  TODO(benjhayden): Test other sources of
 // interruptions such as server death.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Cancel) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
@@ skipping 1820 matching lines @@
   EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
   EXPECT_FALSE(warnings.empty());
   EXPECT_EQ(Warning::kDownloadFilenameConflict,
             warnings.begin()->warning_type());
   EXPECT_EQ("incumbent", warnings.begin()->extension_id());
 }
 
 }  // namespace extensions
 
 #endif  // http://crbug.com/306144