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

Unified Diff: chrome/browser/safe_browsing/two_phase_uploader_unittest.cc

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « chrome/browser/safe_browsing/two_phase_uploader.cc ('k') | chrome/browser/safe_browsing/ui_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
diff --git a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
index 8a58e2f6a38c595b4c4ad27c04cb6680719d20e4..11fda28bb90dbe9d47a638e53388e1aa25a5460d 100644
--- a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
+++ b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
@@ -83,14 +83,14 @@ TEST_F(TwoPhaseUploaderTest, UploadFile) {
ASSERT_TRUE(test_server.Start());
Delegate delegate;
scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
- url_request_context_getter_,
+ url_request_context_getter_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
test_server.GetURL("start"),
"metadata",
GetTestFilePath(),
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
- base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
- runner)));
+ base::Bind(
+ &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
uploader->Start();
runner->Run();
EXPECT_EQ(TwoPhaseUploader::STATE_SUCCESS, delegate.state_);
@@ -109,14 +109,14 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseOneResponse) {
ASSERT_TRUE(test_server.Start());
Delegate delegate;
scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
- url_request_context_getter_,
+ url_request_context_getter_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
test_server.GetURL("start?p1code=500"),
"metadata",
GetTestFilePath(),
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
- base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
- runner)));
+ base::Bind(
+ &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
uploader->Start();
runner->Run();
EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -131,14 +131,14 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseTwoResponse) {
ASSERT_TRUE(test_server.Start());
Delegate delegate;
scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
- url_request_context_getter_,
+ url_request_context_getter_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
test_server.GetURL("start?p2code=500"),
"metadata",
GetTestFilePath(),
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
- base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
- runner)));
+ base::Bind(
+ &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
uploader->Start();
runner->Run();
EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
@@ -157,14 +157,14 @@ TEST_F(TwoPhaseUploaderTest, PhaseOneConnectionClosed) {
ASSERT_TRUE(test_server.Start());
Delegate delegate;
scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
- url_request_context_getter_,
+ url_request_context_getter_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
test_server.GetURL("start?p1close=1"),
"metadata",
GetTestFilePath(),
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
- base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
- runner)));
+ base::Bind(
+ &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
uploader->Start();
runner->Run();
EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -179,14 +179,14 @@ TEST_F(TwoPhaseUploaderTest, PhaseTwoConnectionClosed) {
ASSERT_TRUE(test_server.Start());
Delegate delegate;
scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
- url_request_context_getter_,
+ url_request_context_getter_.get(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
test_server.GetURL("start?p2close=1"),
"metadata",
GetTestFilePath(),
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
- base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
- runner)));
+ base::Bind(
+ &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
uploader->Start();
runner->Run();
EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
« no previous file with comments | « chrome/browser/safe_browsing/two_phase_uploader.cc ('k') | chrome/browser/safe_browsing/ui_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698