diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:47:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:47:19 +0000 |
| commit | 881e921a6d5e9f58495c5f365edd52fe55fc8cdc (patch) | |
| tree | 305d715dc58a3b3b82f057ab48554b1012334526 /chrome/browser/history/history_backend.h | |
| parent | 7721c3a71f3ef99dccf63d85cae219f42e6d32b2 (diff) | |
| download | chromium_src-881e921a6d5e9f58495c5f365edd52fe55fc8cdc.zip chromium_src-881e921a6d5e9f58495c5f365edd52fe55fc8cdc.tar.gz chromium_src-881e921a6d5e9f58495c5f365edd52fe55fc8cdc.tar.bz2 | |
Change HistoryBackend::MergeFavicon to work with a passed in icon URL
BUG=151466
Test=HistoryBackendTest
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/11417072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend.h')
| -rw-r--r-- | chrome/browser/history/history_backend.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index 399257a..1b16238 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -286,6 +286,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, const std::vector<ui::ScaleFactor>& desired_scale_factors); void MergeFavicon(const GURL& page_url, + const GURL& icon_url, IconType icon_type, scoped_refptr<base::RefCountedMemory> bitmap_data, const gfx::Size& pixel_size); @@ -516,6 +517,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MergeFaviconPageURLInDB); FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MergeFaviconMaxFaviconsPerPage); FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, + MergeFaviconIconURLMappedToDifferentPageURL); + FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MergeFaviconMaxFaviconBitmapsPerIconURL); FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes); |