Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4689)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/component_updater/test/crx_downloader_unittest.cc

Issue 508473002: Componentize component_updater: Move URLRequestPrepackagedInterceptor from content/ to net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: self review Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/component_updater/test/component_updater_service_unittest.cc ('K') | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/test/crx_downloader_unittest.cc
diff --git a/chrome/browser/component_updater/test/crx_downloader_unittest.cc b/chrome/browser/component_updater/test/crx_downloader_unittest.cc
index ff1dc237d58a7c8e2502f4068c0e716d162b26b3..c35ae3f1a7620b6603ab6cb9c5ebff66fb50ab34 100644
--- a/chrome/browser/component_updater/test/crx_downloader_unittest.cc
+++ b/chrome/browser/component_updater/test/crx_downloader_unittest.cc
@@ -7,19 +7,16 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
-#include "base/threading/sequenced_worker_pool.h"
#include "chrome/common/chrome_paths.h"
#include "components/component_updater/crx_downloader.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "content/test/net/url_request_prepackaged_interceptor.h"
#include "net/base/net_errors.h"
+#include "net/url_request/url_request_prepackaged_interceptor.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-using content::BrowserThread;
using base::ContentsEqual;
namespace component_updater {
@@ -27,7 +24,7 @@ namespace component_updater {
namespace {
// Intercepts HTTP GET requests sent to "localhost".
-typedef content::URLLocalHostRequestPrepackagedInterceptor GetInterceptor;
+typedef net::URLLocalHostRequestPrepackagedInterceptor GetInterceptor;
const char kTestFileName[] = "jebgalgnebhfojomionfpkfelancnnkf.crx";
@@ -59,6 +56,8 @@ class CrxDownloaderTest : public testing::Test {
protected:
scoped_ptr<CrxDownloader> crx_downloader_;
+ scoped_ptr<GetInterceptor> get_interceptor_;
+
CrxDownloader::DownloadCallback callback_;
CrxDownloader::ProgressCallback progress_callback_;
@@ -75,9 +74,8 @@ class CrxDownloaderTest : public testing::Test {
static const int kExpectedContext = 0xaabb;
private:
- scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
+ base::MessageLoopForIO loop_;
scoped_refptr<net::TestURLRequestContextGetter> context_;
- content::TestBrowserThreadBundle thread_bundle_;
base::Closure quit_closure_;
};
@@ -93,17 +91,16 @@ CrxDownloaderTest::CrxDownloaderTest()
crx_context_(0),
num_download_complete_calls_(0),
num_progress_calls_(0),
- blocking_task_runner_(BrowserThread::GetBlockingPool()->
- GetSequencedTaskRunnerWithShutdownBehavior(
- BrowserThread::GetBlockingPool()->GetSequenceToken(),
- base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)),
context_(new net::TestURLRequestContextGetter(
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))),
- thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
+ base::MessageLoopProxy::current())) {
}
CrxDownloaderTest::~CrxDownloaderTest() {
context_ = NULL;
+
+ // The GetInterceptor requires the message loop to run to destruct correctly.
+ get_interceptor_.reset();
+ RunThreadsUntilIdle();
}
void CrxDownloaderTest::SetUp() {
@@ -111,12 +108,16 @@ void CrxDownloaderTest::SetUp() {
download_complete_result_ = CrxDownloader::Result();
num_progress_calls_ = 0;
download_progress_result_ = CrxDownloader::Result();
+
crx_downloader_.reset(CrxDownloader::Create(
false, // Do not use the background downloader in these tests.
context_.get(),
- blocking_task_runner_,
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
+ base::MessageLoopProxy::current(),
+ NULL /* background_task_runner */));
Sorin Jianu 2014/08/26 20:32:52 Consider not using the inline /* */.
tommycli 2014/08/26 21:06:58 Done.
crx_downloader_->set_progress_callback(progress_callback_);
+
+ get_interceptor_.reset(new GetInterceptor(base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current()));
}
void CrxDownloaderTest::TearDown() {
@@ -179,13 +180,12 @@ TEST_F(CrxDownloaderTest, OneUrl) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
crx_downloader_->StartDownloadFromUrl(expected_crx_url, callback_);
RunThreads();
- EXPECT_EQ(1, interceptor.GetHitCount());
+ EXPECT_EQ(1, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -214,8 +214,7 @@ TEST_F(CrxDownloaderTest, MAYBE_TwoUrls) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
std::vector<GURL> urls;
urls.push_back(expected_crx_url);
@@ -224,7 +223,7 @@ TEST_F(CrxDownloaderTest, MAYBE_TwoUrls) {
crx_downloader_->StartDownload(urls, callback_);
RunThreads();
- EXPECT_EQ(1, interceptor.GetHitCount());
+ EXPECT_EQ(1, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -246,8 +245,7 @@ TEST_F(CrxDownloaderTest, OneUrl_InvalidHost) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
crx_downloader_->StartDownloadFromUrl(
GURL("http://no.such.host"
@@ -255,7 +253,7 @@ TEST_F(CrxDownloaderTest, OneUrl_InvalidHost) {
callback_);
RunThreads();
- EXPECT_EQ(0, interceptor.GetHitCount());
+ EXPECT_EQ(0, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -269,14 +267,13 @@ TEST_F(CrxDownloaderTest, OneUrl_InvalidPath) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
crx_downloader_->StartDownloadFromUrl(GURL("http://localhost/no/such/file"),
callback_);
RunThreads();
- EXPECT_EQ(0, interceptor.GetHitCount());
+ EXPECT_EQ(0, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -296,8 +293,7 @@ TEST_F(CrxDownloaderTest, MAYBE_TwoUrls_FirstInvalid) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
std::vector<GURL> urls;
urls.push_back(GURL("http://localhost/no/such/file"));
@@ -306,7 +302,7 @@ TEST_F(CrxDownloaderTest, MAYBE_TwoUrls_FirstInvalid) {
crx_downloader_->StartDownload(urls, callback_);
RunThreads();
- EXPECT_EQ(1, interceptor.GetHitCount());
+ EXPECT_EQ(1, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -329,8 +325,7 @@ TEST_F(CrxDownloaderTest, TwoUrls_SecondInvalid) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
std::vector<GURL> urls;
urls.push_back(expected_crx_url);
@@ -339,7 +334,7 @@ TEST_F(CrxDownloaderTest, TwoUrls_SecondInvalid) {
crx_downloader_->StartDownload(urls, callback_);
RunThreads();
- EXPECT_EQ(1, interceptor.GetHitCount());
+ EXPECT_EQ(1, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
@@ -361,8 +356,7 @@ TEST_F(CrxDownloaderTest, TwoUrls_BothInvalid) {
GURL("http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx");
const base::FilePath test_file(MakeTestFilePath(kTestFileName));
- GetInterceptor interceptor;
- interceptor.SetResponse(expected_crx_url, test_file);
+ get_interceptor_->SetResponse(expected_crx_url, test_file);
std::vector<GURL> urls;
urls.push_back(GURL("http://localhost/no/such/file"));
@@ -372,7 +366,7 @@ TEST_F(CrxDownloaderTest, TwoUrls_BothInvalid) {
crx_downloader_->StartDownload(urls, callback_);
RunThreads();
- EXPECT_EQ(0, interceptor.GetHitCount());
+ EXPECT_EQ(0, get_interceptor_->GetHitCount());
EXPECT_EQ(1, num_download_complete_calls_);
EXPECT_EQ(kExpectedContext, crx_context_);
« chrome/browser/component_updater/test/component_updater_service_unittest.cc ('K') | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698