OLD | NEW |
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 "chrome/browser/favicon/favicon_handler.h" | 5 #include "chrome/browser/favicon/favicon_handler.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "chrome/browser/favicon/chrome_favicon_client.h" | 8 #include "chrome/browser/favicon/chrome_favicon_client.h" |
9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" | 9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" |
10 #include "chrome/browser/favicon/favicon_service.h" | 10 #include "chrome/browser/favicon/favicon_service.h" |
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1510 Profile* profile = Profile::FromBrowserContext( | 1510 Profile* profile = Profile::FromBrowserContext( |
1511 web_contents()->GetBrowserContext()); | 1511 web_contents()->GetBrowserContext()); |
1512 | 1512 |
1513 FaviconServiceFactory::GetInstance()->SetTestingFactory( | 1513 FaviconServiceFactory::GetInstance()->SetTestingFactory( |
1514 profile, BuildFaviconService); | 1514 profile, BuildFaviconService); |
1515 | 1515 |
1516 HistoryServiceFactory::GetInstance()->SetTestingFactory( | 1516 HistoryServiceFactory::GetInstance()->SetTestingFactory( |
1517 profile, BuildHistoryService); | 1517 profile, BuildHistoryService); |
1518 | 1518 |
1519 FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( | 1519 FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( |
1520 profile, Profile::IMPLICIT_ACCESS); | 1520 profile, ServiceAccessType::IMPLICIT_ACCESS); |
1521 | 1521 |
1522 FaviconTabHelper::CreateForWebContents(web_contents()); | 1522 FaviconTabHelper::CreateForWebContents(web_contents()); |
1523 FaviconTabHelper* favicon_tab_helper = | 1523 FaviconTabHelper* favicon_tab_helper = |
1524 FaviconTabHelper::FromWebContents(web_contents()); | 1524 FaviconTabHelper::FromWebContents(web_contents()); |
1525 | 1525 |
1526 std::vector<SkBitmap> empty_icons; | 1526 std::vector<SkBitmap> empty_icons; |
1527 std::vector<gfx::Size> empty_icon_sizes; | 1527 std::vector<gfx::Size> empty_icon_sizes; |
1528 int download_id = 0; | 1528 int download_id = 0; |
1529 | 1529 |
1530 // Try to download missing icon. | 1530 // Try to download missing icon. |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1652 EXPECT_EQ(new_favicon_url, driver1.available_icon_url()); | 1652 EXPECT_EQ(new_favicon_url, driver1.available_icon_url()); |
1653 EXPECT_FALSE(driver1.update_active_favicon()); | 1653 EXPECT_FALSE(driver1.update_active_favicon()); |
1654 EXPECT_EQ(3u, driver1.num_favicon_available()); | 1654 EXPECT_EQ(3u, driver1.num_favicon_available()); |
1655 } | 1655 } |
1656 | 1656 |
1657 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse, | 1657 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse, |
1658 FaviconHandlerActiveFaviconValidityParamTest, | 1658 FaviconHandlerActiveFaviconValidityParamTest, |
1659 ::testing::Bool()); | 1659 ::testing::Bool()); |
1660 | 1660 |
1661 } // namespace. | 1661 } // namespace. |
OLD | NEW |