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

Unified Diff: chrome/browser/history/history_backend_unittest.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 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/history/history_backend.cc ('k') | chrome/browser/history/history_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 3f965dd2d6313a58897b926a0bed8cc9b4c2cc11..39dde90c4034308757e3f647b403ac7c08ad5794 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -1629,7 +1629,7 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
HistoryBackendCancelableRequest cancellable_request;
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
backend_->UpdateFaviconMappingsAndFetch(request, page_url2, icon_urls,
FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
@@ -1710,7 +1710,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
HistoryBackendCancelableRequest cancellable_request;
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
backend_->UpdateFaviconMappingsAndFetch(request, page_url, icon_urls,
FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
@@ -1999,7 +1999,7 @@ TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {
scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
// Request favicon bitmaps for both 1x and 2x to simulate request done by
// BookmarkModel::GetFavicon().
@@ -2051,7 +2051,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
HistoryBackendCancelableRequest cancellable_request;
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
backend_->UpdateFaviconMappingsAndFetch(request, page_url3, icon_urls,
TOUCH_ICON | TOUCH_PRECOMPOSED_ICON, kSmallSize.width(),
GetScaleFactors1x2x());
@@ -2278,7 +2278,7 @@ TEST_F(HistoryBackendTest, GetFaviconsNoDB) {
scoped_refptr<GetFaviconRequest> request1(new GetFaviconRequest(
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request1);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request1.get());
EXPECT_TRUE(cancellable_request.HasPendingRequests());
backend_->UpdateFaviconMappingsAndFetch(request1, GURL(), std::vector<GURL>(),
FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
@@ -2287,7 +2287,7 @@ TEST_F(HistoryBackendTest, GetFaviconsNoDB) {
scoped_refptr<GetFaviconRequest> request2(new GetFaviconRequest(
base::Bind(&HistoryBackendTest::OnFaviconResults,
base::Unretained(this))));
- cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request2);
+ cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request2.get());
EXPECT_TRUE(cancellable_request.HasPendingRequests());
backend_->GetFaviconsForURL(request2, GURL(), FAVICON, kSmallSize.width(),
GetScaleFactors1x2x());
@@ -2423,7 +2423,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Unretained(static_cast<HistoryBackendTest*>(this))));
HistoryBackendCancelableRequest cancellable_request;
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request1);
+ request1.get());
VisitFilter filter;
// Time limit is |tested_time| +/- 45 min.
@@ -2446,7 +2446,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request2);
+ request2.get());
filter.SetFilterTime(tested_time + one_hour);
filter.SetFilterWidth(one_hour);
backend_->QueryFilteredURLs(request2, 100, filter, false);
@@ -2462,7 +2462,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request3);
+ request3.get());
filter.SetFilterTime(tested_time - one_hour);
filter.SetFilterWidth(one_hour);
backend_->QueryFilteredURLs(request3, 100, filter, false);
@@ -2483,7 +2483,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request4);
+ request4.get());
filter.SetFilterTime(tested_time);
filter.SetDayOfTheWeekFilter(static_cast<int>(exploded_time.day_of_week));
backend_->QueryFilteredURLs(request4, 100, filter, false);
@@ -2499,7 +2499,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request5);
+ request5.get());
filter.SetFilterTime(tested_time - base::TimeDelta::FromMinutes(40));
filter.SetFilterWidth(base::TimeDelta::FromMinutes(20));
backend_->QueryFilteredURLs(request5, 100, filter, false);
@@ -2514,7 +2514,7 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
- request6);
+ request6.get());
filter.SetFilterTime(tested_time);
filter.SetFilterWidth(one_hour * 2);
backend_->QueryFilteredURLs(request6, 100, filter, true);
« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698