Merge 241734 "Added support for multiple urls in the component u..."

chrome/browser/component_updater/test/crx_downloader_unittest.cc

 // Copyright 2013 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/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 86 matching lines @@
       blocking_task_runner_,
       base::Bind(&CrxDownloaderTest::DownloadComplete,
                  base::Unretained(this),
                  kExpectedContext)));
 }
 
 void CrxDownloaderTest::TearDown() {
 }
 
 void CrxDownloaderTest::Quit() {
-  quit_closure_.Run();
+  if (!quit_closure_.is_null())
+    quit_closure_.Run();
 }
 
 void CrxDownloaderTest::DownloadComplete(
     int crx_context,
     const CrxDownloader::Result& result) {
   ++num_calls_;
   crx_context_ = crx_context;
   error_ = result.error;
   response_ = result.response;
   Quit();
 }
 
 void CrxDownloaderTest::RunThreads() {
   base::RunLoop runloop;
   quit_closure_ = runloop.QuitClosure();
   runloop.Run();
 
   // Since some tests need to drain currently enqueued tasks such as network
   // intercepts on the IO thread, run the threads until they are
   // idle. The component updater service won't loop again until the loop count
   // is set and the service is started.
   RunThreadsUntilIdle();
 }
 
 void CrxDownloaderTest::RunThreadsUntilIdle() {
   base::RunLoop().RunUntilIdle();
 }
 
+// Tests that starting a download without a url results in an error.
+TEST_F(CrxDownloaderTest, NoUrl) {
+  std::vector<GURL> urls;
+  crx_downloader_->StartDownload(urls);
+
+  RunThreadsUntilIdle();
+  EXPECT_EQ(-1, error_);
+  EXPECT_EQ(kExpectedContext, crx_context_);
+
+  EXPECT_EQ(1, num_calls_);
+}
+
 // Tests that downloading from one url is successful.
 TEST_F(CrxDownloaderTest, OneUrl) {
   const GURL expected_crx_url =
     GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
 
   GetInterceptor interceptor;
   interceptor.SetResponse(
        expected_crx_url,
        test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
@@ skipping 143 matching lines @@
   RunThreads();
   EXPECT_EQ(0, interceptor.GetHitCount());
   EXPECT_NE(0, error_);
   EXPECT_EQ(kExpectedContext, crx_context_);
 
   EXPECT_EQ(1, num_calls_);
 }
 
 }  // namespace component_updater