content/browser/download/download_manager_impl_unittest.cc - Issue 15701007: BrowserContext should simply own DownloadManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/download/download_manager_impl_unittest.cc

Issue 15701007: BrowserContext should simply own DownloadManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 7 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

« content/browser/download/download_manager_impl.h ('K') | « content/browser/download/download_manager_impl.cc ('k') | content/public/browser/download_manager.h » ('j') | content/public/test/mock_download_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/download/download_manager_impl_unittest.cc

diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc

index 8b40d8701d003fc7bd8761fb04123564724389f1..300eb2e0bb9a5ba645f26cec1300d0f4ef29b522 100644

--- a/content/browser/download/download_manager_impl_unittest.cc

+++ b/content/browser/download/download_manager_impl_unittest.cc

@@ -444,7 +444,7 @@ class DownloadManagerTest : public testing::Test {

// then create a DownloadManager that points

// at all of those.

virtual void SetUp() {

- DCHECK(!download_manager_.get());

+ DCHECK(!download_manager_);

mock_download_item_factory_ = (new MockDownloadItemFactory())->AsWeakPtr();

mock_download_file_factory_ = (new MockDownloadFileFactory())->AsWeakPtr();

@@ -456,8 +456,8 @@ class DownloadManagerTest : public testing::Test {

EXPECT_CALL(*mock_browser_context_.get(), IsOffTheRecord())

.WillRepeatedly(Return(false));

- download_manager_ = new DownloadManagerImpl(

- NULL, mock_browser_context_.get());

+ download_manager_.reset(new DownloadManagerImpl(

+ NULL, mock_browser_context_.get()));

download_manager_->SetDownloadItemFactoryForTesting(

scoped_ptr<DownloadItemFactory>(

mock_download_item_factory_.get()).Pass());

@@ -481,7 +481,7 @@ class DownloadManagerTest : public testing::Test {

.WillOnce(Return());

download_manager_->Shutdown();

- download_manager_ = NULL;

+ download_manager_.reset();

message_loop_.RunUntilIdle();

ASSERT_EQ(NULL, mock_download_item_factory_.get());

ASSERT_EQ(NULL, mock_download_file_factory_.get());

@@ -555,7 +555,7 @@ class DownloadManagerTest : public testing::Test {

protected:

// Key test variable; we'll keep it available to sub-classes.

- scoped_refptr<DownloadManagerImpl> download_manager_;

+ scoped_ptr<DownloadManagerImpl> download_manager_;

base::WeakPtr<MockDownloadFileFactory> mock_download_file_factory_;

// Target detetermined callback.