diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 16:04:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 16:04:12 +0000 |
| commit | e7013f4c21d2f8c9da89c705760dae2498f38edd (patch) | |
| tree | 964a7df5cb8401e907be83e0696ff79cd0aed87b /chrome/browser/favicon | |
| parent | 3abbed000fefd2f846da29a5c14683bf32ff1867 (diff) | |
| download | chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.zip chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.tar.gz chromium_src-e7013f4c21d2f8c9da89c705760dae2498f38edd.tar.bz2 | |
Removal of Profile from content part 5.
BUG=76788
TEST=no change visible
Review URL: http://codereview.chromium.org/7523054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
| -rw-r--r-- | chrome/browser/favicon/favicon_handler_unittest.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc index a76192d..8759a23 100644 --- a/chrome/browser/favicon/favicon_handler_unittest.cc +++ b/chrome/browser/favicon/favicon_handler_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/favicon/favicon_handler.h" +#include "chrome/browser/profiles/profile.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/test_tab_contents.h" @@ -312,7 +313,8 @@ TEST_F(FaviconHandlerTest, GetFaviconFromHistory) { const GURL icon_url("http://www.google.com/favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::FAVICON); helper.FetchFavicon(page_url); @@ -359,7 +361,8 @@ TEST_F(FaviconHandlerTest, DownloadFavicon) { const GURL icon_url("http://www.google.com/favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::FAVICON); helper.FetchFavicon(page_url); @@ -425,7 +428,8 @@ TEST_F(FaviconHandlerTest, UpdateAndDownloadFavicon) { const GURL new_icon_url("http://www.google.com/new_favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::FAVICON); helper.FetchFavicon(page_url); @@ -512,7 +516,8 @@ TEST_F(FaviconHandlerTest, UpdateFavicon) { const GURL new_icon_url("http://www.google.com/new_favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::FAVICON); helper.FetchFavicon(page_url); @@ -585,7 +590,8 @@ TEST_F(FaviconHandlerTest, Download2ndFaviconURLCandidate) { const GURL new_icon_url("http://www.google.com/new_favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::TOUCH); helper.FetchFavicon(page_url); @@ -701,7 +707,8 @@ TEST_F(FaviconHandlerTest, UpdateDuringDownloading) { const GURL new_icon_url("http://www.google.com/new_favicon"); TestFaviconHandlerDelegate delegate(contents()); - TestFaviconHandler helper(page_url, contents()->profile(), + Profile* profile = Profile::FromBrowserContext(contents()->browser_context()); + TestFaviconHandler helper(page_url, profile, &delegate, FaviconHandler::TOUCH); helper.FetchFavicon(page_url); |