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

Side by Side 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, 1 month 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 backend_->SetFavicons(page_url1, FAVICON, favicon_bitmap_data, 1622 backend_->SetFavicons(page_url1, FAVICON, favicon_bitmap_data,
1623 icon_url_sizes); 1623 icon_url_sizes);
1624 1624
1625 std::vector<GURL> icon_urls; 1625 std::vector<GURL> icon_urls;
1626 icon_urls.push_back(icon_url); 1626 icon_urls.push_back(icon_url);
1627 1627
1628 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest( 1628 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
1629 base::Bind(&HistoryBackendTest::OnFaviconResults, 1629 base::Bind(&HistoryBackendTest::OnFaviconResults,
1630 base::Unretained(this)))); 1630 base::Unretained(this))));
1631 HistoryBackendCancelableRequest cancellable_request; 1631 HistoryBackendCancelableRequest cancellable_request;
1632 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request); 1632 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
1633 backend_->UpdateFaviconMappingsAndFetch(request, page_url2, icon_urls, 1633 backend_->UpdateFaviconMappingsAndFetch(request, page_url2, icon_urls,
1634 FAVICON, kSmallSize.width(), GetScaleFactors1x2x()); 1634 FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
1635 1635
1636 // Check that the same FaviconID is mapped to both page URLs. 1636 // Check that the same FaviconID is mapped to both page URLs.
1637 std::vector<IconMapping> icon_mappings; 1637 std::vector<IconMapping> icon_mappings;
1638 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL( 1638 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
1639 page_url1, &icon_mappings)); 1639 page_url1, &icon_mappings));
1640 EXPECT_EQ(1u, icon_mappings.size()); 1640 EXPECT_EQ(1u, icon_mappings.size());
1641 FaviconID favicon_id = icon_mappings[0].icon_id; 1641 FaviconID favicon_id = icon_mappings[0].icon_id;
1642 EXPECT_NE(0, favicon_id); 1642 EXPECT_NE(0, favicon_id);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1703 icon_url, FAVICON, NULL); 1703 icon_url, FAVICON, NULL);
1704 EXPECT_NE(0, icon_id); 1704 EXPECT_NE(0, icon_id);
1705 EXPECT_EQ(1, num_broadcasted_notifications()); 1705 EXPECT_EQ(1, num_broadcasted_notifications());
1706 1706
1707 std::vector<GURL> icon_urls; 1707 std::vector<GURL> icon_urls;
1708 icon_urls.push_back(icon_url); 1708 icon_urls.push_back(icon_url);
1709 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest( 1709 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
1710 base::Bind(&HistoryBackendTest::OnFaviconResults, 1710 base::Bind(&HistoryBackendTest::OnFaviconResults,
1711 base::Unretained(this)))); 1711 base::Unretained(this))));
1712 HistoryBackendCancelableRequest cancellable_request; 1712 HistoryBackendCancelableRequest cancellable_request;
1713 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request); 1713 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
1714 backend_->UpdateFaviconMappingsAndFetch(request, page_url, icon_urls, 1714 backend_->UpdateFaviconMappingsAndFetch(request, page_url, icon_urls,
1715 FAVICON, kSmallSize.width(), GetScaleFactors1x2x()); 1715 FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
1716 1716
1717 EXPECT_EQ(icon_id, backend_->thumbnail_db_->GetFaviconIDForFaviconURL( 1717 EXPECT_EQ(icon_id, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
1718 icon_url, FAVICON, NULL)); 1718 icon_url, FAVICON, NULL));
1719 1719
1720 // No notification should have been broadcast as no icon mapping, favicon, 1720 // No notification should have been broadcast as no icon mapping, favicon,
1721 // or favicon bitmap was updated, added or removed. 1721 // or favicon bitmap was updated, added or removed.
1722 EXPECT_EQ(1, num_broadcasted_notifications()); 1722 EXPECT_EQ(1, num_broadcasted_notifications());
1723 } 1723 }
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1992 std::vector<unsigned char> data; 1992 std::vector<unsigned char> data;
1993 data.push_back('c'); 1993 data.push_back('c');
1994 scoped_refptr<base::RefCountedBytes> bitmap_data( 1994 scoped_refptr<base::RefCountedBytes> bitmap_data(
1995 new base::RefCountedBytes(data)); 1995 new base::RefCountedBytes(data));
1996 backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kSmallSize); 1996 backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kSmallSize);
1997 1997
1998 HistoryBackendCancelableRequest cancellable_request; 1998 HistoryBackendCancelableRequest cancellable_request;
1999 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest( 1999 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
2000 base::Bind(&HistoryBackendTest::OnFaviconResults, 2000 base::Bind(&HistoryBackendTest::OnFaviconResults,
2001 base::Unretained(this)))); 2001 base::Unretained(this))));
2002 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request); 2002 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
2003 2003
2004 // Request favicon bitmaps for both 1x and 2x to simulate request done by 2004 // Request favicon bitmaps for both 1x and 2x to simulate request done by
2005 // BookmarkModel::GetFavicon(). 2005 // BookmarkModel::GetFavicon().
2006 backend_->GetFaviconsForURL(request, page_url, FAVICON, kSmallSize.width(), 2006 backend_->GetFaviconsForURL(request, page_url, FAVICON, kSmallSize.width(),
2007 GetScaleFactors1x2x()); 2007 GetScaleFactors1x2x());
2008 2008
2009 const std::vector<history::FaviconBitmapResult> favicon_bitmap_results = 2009 const std::vector<history::FaviconBitmapResult> favicon_bitmap_results =
2010 get_favicon_bitmap_results(); 2010 get_favicon_bitmap_results();
2011 EXPECT_EQ(2u, favicon_bitmap_results.size()); 2011 EXPECT_EQ(2u, favicon_bitmap_results.size());
2012 const FaviconBitmapResult& first_result = favicon_bitmap_results[0]; 2012 const FaviconBitmapResult& first_result = favicon_bitmap_results[0];
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
2044 icon_url_sizes); 2044 icon_url_sizes);
2045 2045
2046 std::vector<GURL> icon_urls; 2046 std::vector<GURL> icon_urls;
2047 icon_urls.push_back(icon_urla); 2047 icon_urls.push_back(icon_urla);
2048 icon_urls.push_back(icon_urlb); 2048 icon_urls.push_back(icon_urlb);
2049 icon_urls.push_back(icon_urlc); 2049 icon_urls.push_back(icon_urlc);
2050 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest( 2050 scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
2051 base::Bind(&HistoryBackendTest::OnFaviconResults, 2051 base::Bind(&HistoryBackendTest::OnFaviconResults,
2052 base::Unretained(this)))); 2052 base::Unretained(this))));
2053 HistoryBackendCancelableRequest cancellable_request; 2053 HistoryBackendCancelableRequest cancellable_request;
2054 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request); 2054 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request.get());
2055 backend_->UpdateFaviconMappingsAndFetch(request, page_url3, icon_urls, 2055 backend_->UpdateFaviconMappingsAndFetch(request, page_url3, icon_urls,
2056 TOUCH_ICON | TOUCH_PRECOMPOSED_ICON, kSmallSize.width(), 2056 TOUCH_ICON | TOUCH_PRECOMPOSED_ICON, kSmallSize.width(),
2057 GetScaleFactors1x2x()); 2057 GetScaleFactors1x2x());
2058 2058
2059 // |page_url1| and |page_url2| should still be mapped to the same icon URLs. 2059 // |page_url1| and |page_url2| should still be mapped to the same icon URLs.
2060 std::vector<IconMapping> icon_mappings; 2060 std::vector<IconMapping> icon_mappings;
2061 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url1, 2061 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url1,
2062 &icon_mappings)); 2062 &icon_mappings));
2063 EXPECT_EQ(1u, icon_mappings.size()); 2063 EXPECT_EQ(1u, icon_mappings.size());
2064 EXPECT_EQ(icon_urla, icon_mappings[0].icon_url); 2064 EXPECT_EQ(icon_urla, icon_mappings[0].icon_url);
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
2271 // to the UI when there is no valid thumbnail database. 2271 // to the UI when there is no valid thumbnail database.
2272 TEST_F(HistoryBackendTest, GetFaviconsNoDB) { 2272 TEST_F(HistoryBackendTest, GetFaviconsNoDB) {
2273 // Make the thumbnail database invalid. 2273 // Make the thumbnail database invalid.
2274 backend_->thumbnail_db_.reset(); 2274 backend_->thumbnail_db_.reset();
2275 2275
2276 HistoryBackendCancelableRequest cancellable_request; 2276 HistoryBackendCancelableRequest cancellable_request;
2277 2277
2278 scoped_refptr<GetFaviconRequest> request1(new GetFaviconRequest( 2278 scoped_refptr<GetFaviconRequest> request1(new GetFaviconRequest(
2279 base::Bind(&HistoryBackendTest::OnFaviconResults, 2279 base::Bind(&HistoryBackendTest::OnFaviconResults,
2280 base::Unretained(this)))); 2280 base::Unretained(this))));
2281 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request1); 2281 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request1.get());
2282 EXPECT_TRUE(cancellable_request.HasPendingRequests()); 2282 EXPECT_TRUE(cancellable_request.HasPendingRequests());
2283 backend_->UpdateFaviconMappingsAndFetch(request1, GURL(), std::vector<GURL>(), 2283 backend_->UpdateFaviconMappingsAndFetch(request1, GURL(), std::vector<GURL>(),
2284 FAVICON, kSmallSize.width(), GetScaleFactors1x2x()); 2284 FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
2285 EXPECT_FALSE(cancellable_request.HasPendingRequests()); 2285 EXPECT_FALSE(cancellable_request.HasPendingRequests());
2286 2286
2287 scoped_refptr<GetFaviconRequest> request2(new GetFaviconRequest( 2287 scoped_refptr<GetFaviconRequest> request2(new GetFaviconRequest(
2288 base::Bind(&HistoryBackendTest::OnFaviconResults, 2288 base::Bind(&HistoryBackendTest::OnFaviconResults,
2289 base::Unretained(this)))); 2289 base::Unretained(this))));
2290 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request2); 2290 cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request2.get());
2291 EXPECT_TRUE(cancellable_request.HasPendingRequests()); 2291 EXPECT_TRUE(cancellable_request.HasPendingRequests());
2292 backend_->GetFaviconsForURL(request2, GURL(), FAVICON, kSmallSize.width(), 2292 backend_->GetFaviconsForURL(request2, GURL(), FAVICON, kSmallSize.width(),
2293 GetScaleFactors1x2x()); 2293 GetScaleFactors1x2x());
2294 EXPECT_FALSE(cancellable_request.HasPendingRequests()); 2294 EXPECT_FALSE(cancellable_request.HasPendingRequests());
2295 } 2295 }
2296 2296
2297 TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) { 2297 TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
2298 const GURL url("http://www.google.com/"); 2298 const GURL url("http://www.google.com/");
2299 const GURL same_domain_url("http://www.google.com/subdir/index.html"); 2299 const GURL same_domain_url("http://www.google.com/subdir/index.html");
2300 const GURL foreign_domain_url("http://www.not-google.com/"); 2300 const GURL foreign_domain_url("http://www.not-google.com/");
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2416 kTypedTransition, 2416 kTypedTransition,
2417 tested_time - half_an_hour); 2417 tested_time - half_an_hour);
2418 backend_->Commit(); 2418 backend_->Commit();
2419 2419
2420 scoped_refptr<QueryFilteredURLsRequest> request1 = 2420 scoped_refptr<QueryFilteredURLsRequest> request1 =
2421 new history::QueryFilteredURLsRequest( 2421 new history::QueryFilteredURLsRequest(
2422 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2422 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2423 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2423 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2424 HistoryBackendCancelableRequest cancellable_request; 2424 HistoryBackendCancelableRequest cancellable_request;
2425 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2425 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2426 request1); 2426 request1.get());
2427 2427
2428 VisitFilter filter; 2428 VisitFilter filter;
2429 // Time limit is |tested_time| +/- 45 min. 2429 // Time limit is |tested_time| +/- 45 min.
2430 base::TimeDelta three_quarters_of_an_hour = base::TimeDelta::FromMinutes(45); 2430 base::TimeDelta three_quarters_of_an_hour = base::TimeDelta::FromMinutes(45);
2431 filter.SetFilterTime(tested_time); 2431 filter.SetFilterTime(tested_time);
2432 filter.SetFilterWidth(three_quarters_of_an_hour); 2432 filter.SetFilterWidth(three_quarters_of_an_hour);
2433 backend_->QueryFilteredURLs(request1, 100, filter, false); 2433 backend_->QueryFilteredURLs(request1, 100, filter, false);
2434 2434
2435 ASSERT_EQ(4U, get_filtered_list().size()); 2435 ASSERT_EQ(4U, get_filtered_list().size());
2436 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec()); 2436 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
2437 EXPECT_EQ(std::string(yahoo_sports_soccer), 2437 EXPECT_EQ(std::string(yahoo_sports_soccer),
2438 get_filtered_list()[1].url.spec()); 2438 get_filtered_list()[1].url.spec());
2439 EXPECT_EQ(std::string(yahoo), get_filtered_list()[2].url.spec()); 2439 EXPECT_EQ(std::string(yahoo), get_filtered_list()[2].url.spec());
2440 EXPECT_EQ(std::string(yahoo_sports), 2440 EXPECT_EQ(std::string(yahoo_sports),
2441 get_filtered_list()[3].url.spec()); 2441 get_filtered_list()[3].url.spec());
2442 2442
2443 // Time limit is between |tested_time| and |tested_time| + 2 hours. 2443 // Time limit is between |tested_time| and |tested_time| + 2 hours.
2444 scoped_refptr<QueryFilteredURLsRequest> request2 = 2444 scoped_refptr<QueryFilteredURLsRequest> request2 =
2445 new history::QueryFilteredURLsRequest( 2445 new history::QueryFilteredURLsRequest(
2446 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2446 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2447 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2447 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2448 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2448 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2449 request2); 2449 request2.get());
2450 filter.SetFilterTime(tested_time + one_hour); 2450 filter.SetFilterTime(tested_time + one_hour);
2451 filter.SetFilterWidth(one_hour); 2451 filter.SetFilterWidth(one_hour);
2452 backend_->QueryFilteredURLs(request2, 100, filter, false); 2452 backend_->QueryFilteredURLs(request2, 100, filter, false);
2453 2453
2454 ASSERT_EQ(3U, get_filtered_list().size()); 2454 ASSERT_EQ(3U, get_filtered_list().size());
2455 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec()); 2455 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
2456 EXPECT_EQ(std::string(yahoo), get_filtered_list()[1].url.spec()); 2456 EXPECT_EQ(std::string(yahoo), get_filtered_list()[1].url.spec());
2457 EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec()); 2457 EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec());
2458 2458
2459 // Time limit is between |tested_time| - 2 hours and |tested_time|. 2459 // Time limit is between |tested_time| - 2 hours and |tested_time|.
2460 scoped_refptr<QueryFilteredURLsRequest> request3 = 2460 scoped_refptr<QueryFilteredURLsRequest> request3 =
2461 new history::QueryFilteredURLsRequest( 2461 new history::QueryFilteredURLsRequest(
2462 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2462 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2463 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2463 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2464 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2464 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2465 request3); 2465 request3.get());
2466 filter.SetFilterTime(tested_time - one_hour); 2466 filter.SetFilterTime(tested_time - one_hour);
2467 filter.SetFilterWidth(one_hour); 2467 filter.SetFilterWidth(one_hour);
2468 backend_->QueryFilteredURLs(request3, 100, filter, false); 2468 backend_->QueryFilteredURLs(request3, 100, filter, false);
2469 2469
2470 ASSERT_EQ(3U, get_filtered_list().size()); 2470 ASSERT_EQ(3U, get_filtered_list().size());
2471 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec()); 2471 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
2472 EXPECT_EQ(std::string(yahoo_sports_soccer), 2472 EXPECT_EQ(std::string(yahoo_sports_soccer),
2473 get_filtered_list()[1].url.spec()); 2473 get_filtered_list()[1].url.spec());
2474 EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec()); 2474 EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec());
2475 2475
2476 filter.ClearFilters(); 2476 filter.ClearFilters();
2477 base::Time::Exploded exploded_time; 2477 base::Time::Exploded exploded_time;
2478 tested_time.LocalExplode(&exploded_time); 2478 tested_time.LocalExplode(&exploded_time);
2479 2479
2480 // Today. 2480 // Today.
2481 scoped_refptr<QueryFilteredURLsRequest> request4 = 2481 scoped_refptr<QueryFilteredURLsRequest> request4 =
2482 new history::QueryFilteredURLsRequest( 2482 new history::QueryFilteredURLsRequest(
2483 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2483 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2484 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2484 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2485 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2485 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2486 request4); 2486 request4.get());
2487 filter.SetFilterTime(tested_time); 2487 filter.SetFilterTime(tested_time);
2488 filter.SetDayOfTheWeekFilter(static_cast<int>(exploded_time.day_of_week)); 2488 filter.SetDayOfTheWeekFilter(static_cast<int>(exploded_time.day_of_week));
2489 backend_->QueryFilteredURLs(request4, 100, filter, false); 2489 backend_->QueryFilteredURLs(request4, 100, filter, false);
2490 2490
2491 ASSERT_EQ(2U, get_filtered_list().size()); 2491 ASSERT_EQ(2U, get_filtered_list().size());
2492 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec()); 2492 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
2493 EXPECT_EQ(std::string(yahoo_sports_soccer), 2493 EXPECT_EQ(std::string(yahoo_sports_soccer),
2494 get_filtered_list()[1].url.spec()); 2494 get_filtered_list()[1].url.spec());
2495 2495
2496 // Today + time limit - only yahoo_sports_soccer should fit. 2496 // Today + time limit - only yahoo_sports_soccer should fit.
2497 scoped_refptr<QueryFilteredURLsRequest> request5 = 2497 scoped_refptr<QueryFilteredURLsRequest> request5 =
2498 new history::QueryFilteredURLsRequest( 2498 new history::QueryFilteredURLsRequest(
2499 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2499 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2500 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2500 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2501 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2501 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2502 request5); 2502 request5.get());
2503 filter.SetFilterTime(tested_time - base::TimeDelta::FromMinutes(40)); 2503 filter.SetFilterTime(tested_time - base::TimeDelta::FromMinutes(40));
2504 filter.SetFilterWidth(base::TimeDelta::FromMinutes(20)); 2504 filter.SetFilterWidth(base::TimeDelta::FromMinutes(20));
2505 backend_->QueryFilteredURLs(request5, 100, filter, false); 2505 backend_->QueryFilteredURLs(request5, 100, filter, false);
2506 2506
2507 ASSERT_EQ(1U, get_filtered_list().size()); 2507 ASSERT_EQ(1U, get_filtered_list().size());
2508 EXPECT_EQ(std::string(yahoo_sports_soccer), 2508 EXPECT_EQ(std::string(yahoo_sports_soccer),
2509 get_filtered_list()[0].url.spec()); 2509 get_filtered_list()[0].url.spec());
2510 2510
2511 // Make sure we get debug data if we request it. 2511 // Make sure we get debug data if we request it.
2512 scoped_refptr<QueryFilteredURLsRequest> request6 = 2512 scoped_refptr<QueryFilteredURLsRequest> request6 =
2513 new history::QueryFilteredURLsRequest( 2513 new history::QueryFilteredURLsRequest(
2514 base::Bind(&HistoryBackendTest::OnQueryFiltered, 2514 base::Bind(&HistoryBackendTest::OnQueryFiltered,
2515 base::Unretained(static_cast<HistoryBackendTest*>(this)))); 2515 base::Unretained(static_cast<HistoryBackendTest*>(this))));
2516 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>( 2516 cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
2517 request6); 2517 request6.get());
2518 filter.SetFilterTime(tested_time); 2518 filter.SetFilterTime(tested_time);
2519 filter.SetFilterWidth(one_hour * 2); 2519 filter.SetFilterWidth(one_hour * 2);
2520 backend_->QueryFilteredURLs(request6, 100, filter, true); 2520 backend_->QueryFilteredURLs(request6, 100, filter, true);
2521 2521
2522 // If the SegmentID is used by QueryFilteredURLs when generating the debug 2522 // If the SegmentID is used by QueryFilteredURLs when generating the debug
2523 // data instead of the URLID, the |total_visits| for the |yahoo_sports_soccer| 2523 // data instead of the URLID, the |total_visits| for the |yahoo_sports_soccer|
2524 // entry will be zero instead of 1. 2524 // entry will be zero instead of 1.
2525 ASSERT_GE(get_filtered_list().size(), 2U); 2525 ASSERT_GE(get_filtered_list().size(), 2U);
2526 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec()); 2526 EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
2527 EXPECT_EQ(std::string(yahoo_sports_soccer), 2527 EXPECT_EQ(std::string(yahoo_sports_soccer),
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
2660 2660
2661 backend_->DeleteURL(url); 2661 backend_->DeleteURL(url);
2662 backend_->AddPageNoVisitForBookmark(url, string16()); 2662 backend_->AddPageNoVisitForBookmark(url, string16());
2663 backend_->GetURL(url, &row); 2663 backend_->GetURL(url, &row);
2664 EXPECT_EQ(url, row.url()); 2664 EXPECT_EQ(url, row.url());
2665 EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title()); 2665 EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
2666 EXPECT_EQ(0, row.visit_count()); 2666 EXPECT_EQ(0, row.visit_count());
2667 } 2667 }
2668 2668
2669 } // namespace history 2669 } // namespace history
OLDNEW
« 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