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

Unified Diff: chrome/browser/safe_browsing/client_side_detection_host_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
Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 3447553240ffb74602d2f6e9922e00ef08520ba3..57ad5682cb9e272153dcdb5b8439d27c206c52f9 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -215,7 +215,8 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
csd_host_.reset(safe_browsing::ClientSideDetectionHost::Create(
web_contents()));
csd_host_->set_client_side_detection_service(csd_service_.get());
- csd_host_->set_safe_browsing_managers(ui_manager_, database_manager_);
+ csd_host_->set_safe_browsing_managers(ui_manager_.get(),
+ database_manager_.get());
// We need to create this here since we don't call
// DidNavigateMainFramePostCommit in this test.
csd_host_->browse_info_.reset(new BrowseInfo);
@@ -289,7 +290,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
.WillRepeatedly(Return(*is_incognito));
}
if (match_csd_whitelist) {
- EXPECT_CALL(*database_manager_, MatchCsdWhitelistUrl(url))
+ EXPECT_CALL(*database_manager_.get(), MatchCsdWhitelistUrl(url))
.WillOnce(Return(*match_csd_whitelist));
}
if (get_valid_cached_result) {
@@ -405,7 +406,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneNotPhishing) {
ASSERT_FALSE(cb.is_null());
// Make sure DoDisplayBlockingPage is not going to be called.
- EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_)).Times(0);
+ EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_)).Times(0);
cb.Run(GURL(verdict.url()), false);
base::MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
@@ -437,7 +438,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) {
ASSERT_FALSE(cb.is_null());
// Make sure DoDisplayBlockingPage is not going to be called.
- EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_)).Times(0);
+ EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_)).Times(0);
cb.Run(GURL(verdict.url()), false);
base::MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
@@ -470,7 +471,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
ASSERT_FALSE(cb.is_null());
UnsafeResource resource;
- EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+ EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
.WillOnce(SaveArg<0>(&resource));
cb.Run(phishing_url, true);
@@ -559,7 +560,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
// We expect that the interstitial is shown for the second phishing URL and
// not for the first phishing URL.
UnsafeResource resource;
- EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+ EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
.WillOnce(SaveArg<0>(&resource));
cb.Run(phishing_url, true); // Should have no effect.
@@ -951,7 +952,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
NULL);
UnsafeResource resource;
- EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+ EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
.WillOnce(SaveArg<0>(&resource));
NavigateAndCommit(url);
« no previous file with comments | « chrome/browser/safe_browsing/client_side_detection_host.cc ('k') | chrome/browser/safe_browsing/database_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698