chrome/browser/favicon/favicon_handler_unittest.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/favicon/favicon_handler_unittest.cc

Issue 983043003: Componentize FaviconService and FaviconHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_service

Patch Set: Fix android_aosp (reverted the change by mistake by switching computer) Created 5 years, 9 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/favicon/favicon_handler.cc ('k') | chrome/browser/favicon/favicon_service.h » ('j') | no next file with comments »

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 "components/favicon/core/browser/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"

11 #include "chrome/browser/favicon/favicon_service_factory.h"	10 #include "chrome/browser/favicon/favicon_service_factory.h"

12 #include "chrome/browser/favicon/favicon_tab_helper.h"	11 #include "chrome/browser/favicon/favicon_tab_helper.h"

13 #include "chrome/browser/history/history_service_factory.h"	12 #include "chrome/browser/history/history_service_factory.h"

14 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/test/base/chrome_render_view_host_test_harness.h"	14 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

	15 #include "components/favicon/core/browser/favicon_service.h"

16 #include "third_party/skia/include/core/SkBitmap.h"	16 #include "third_party/skia/include/core/SkBitmap.h"

17 #include "ui/gfx/codec/png_codec.h"	17 #include "ui/gfx/codec/png_codec.h"

18 #include "ui/gfx/favicon_size.h"	18 #include "ui/gfx/favicon_size.h"

19 #include "ui/gfx/image/image.h"	19 #include "ui/gfx/image/image.h"

20	20

21 class TestFaviconHandler;	21 class TestFaviconHandler;

22	22

23 using favicon::FaviconURL;	23 using favicon::FaviconURL;

24	24

25 namespace {	25 namespace {

(...skipping 1629 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1655 EXPECT_EQ(new_favicon_url, driver1.available_icon_url());	1655 EXPECT_EQ(new_favicon_url, driver1.available_icon_url());

1656 EXPECT_FALSE(driver1.update_active_favicon());	1656 EXPECT_FALSE(driver1.update_active_favicon());

1657 EXPECT_EQ(3u, driver1.num_favicon_available());	1657 EXPECT_EQ(3u, driver1.num_favicon_available());

1658 }	1658 }

1659	1659

1660 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse,	1660 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse,

1661 FaviconHandlerActiveFaviconValidityParamTest,	1661 FaviconHandlerActiveFaviconValidityParamTest,

1662 ::testing::Bool());	1662 ::testing::Bool());

1663	1663

1664 } // namespace.	1664 } // namespace.

OLD	NEW