diff options
| author | varkha <varkha@chromium.org> | 2016-01-14 13:50:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 22:03:23 +0000 |
| commit | 320be0664f0eb73e8e0a8b9e26e459d78d313f5c (patch) | |
| tree | 10221b00d5f9461963404d8dae662a814ad9bdd8 | |
| parent | 22a872e88053aa1ebeedfea9ce400929ca6e4138 (diff) | |
| download | chromium_src-320be0664f0eb73e8e0a8b9e26e459d78d313f5c.zip chromium_src-320be0664f0eb73e8e0a8b9e26e459d78d313f5c.tar.gz chromium_src-320be0664f0eb73e8e0a8b9e26e459d78d313f5c.tar.bz2 | |
Makes ContentSettingImageModel::GetIcon return empty image when not initialized
When using vector graphics path an icon could be generated even before
UpdateFromWebContents has been called which broke the tests expectations.
BUG=575353, 575354
TEST=unit_tests --gtest_filter=*ContentSettingImageModelTest* --top-chrome-md=material
Review URL: https://codereview.chromium.org/1581693004
Cr-Commit-Position: refs/heads/master@{#369557}
| -rw-r--r-- | chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index 12b2d34..190335e 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -70,7 +70,6 @@ TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) { ContentSettingSimpleImageModel::CreateForContentTypeForTesting( CONTENT_SETTINGS_TYPE_IMAGES); EXPECT_FALSE(content_setting_image_model->is_visible()); - EXPECT_FALSE(HasIcon(*content_setting_image_model)); EXPECT_TRUE(content_setting_image_model->get_tooltip().empty()); content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES); @@ -109,7 +108,6 @@ TEST_F(ContentSettingImageModelTest, CookieAccessed) { ContentSettingSimpleImageModel::CreateForContentTypeForTesting( CONTENT_SETTINGS_TYPE_COOKIES)); EXPECT_FALSE(content_setting_image_model->is_visible()); - EXPECT_FALSE(HasIcon(*content_setting_image_model)); EXPECT_TRUE(content_setting_image_model->get_tooltip().empty()); net::CookieOptions options; |