Vectorize website settings icons in omnibox

chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 45 matching lines @@
 };
 
 TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   scoped_ptr<ContentSettingImageModel> content_setting_image_model(
      ContentSettingImageModel::CreateContentSettingImageModel(
          CONTENT_SETTINGS_TYPE_IMAGES));
   EXPECT_FALSE(content_setting_image_model->is_visible());
-  EXPECT_EQ(0, content_setting_image_model->get_icon());
+  EXPECT_TRUE(content_setting_image_model->icon().IsEmpty());
   EXPECT_TRUE(content_setting_image_model->get_tooltip().empty());
 
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
   content_setting_image_model->UpdateFromWebContents(web_contents());
 
   EXPECT_TRUE(content_setting_image_model->is_visible());
-  EXPECT_NE(0, content_setting_image_model->get_icon());
+  EXPECT_FALSE(content_setting_image_model->icon().IsEmpty());
   EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());
 }
 
 TEST_F(ContentSettingImageModelTest, RPHUpdateFromWebContents) {
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   scoped_ptr<ContentSettingImageModel> content_setting_image_model(
      ContentSettingImageModel::CreateContentSettingImageModel(
          CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS));
   content_setting_image_model->UpdateFromWebContents(web_contents());
   EXPECT_FALSE(content_setting_image_model->is_visible());
@@ skipping 10 matching lines @@
 TEST_F(ContentSettingImageModelTest, CookieAccessed) {
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);
   scoped_ptr<ContentSettingImageModel> content_setting_image_model(
      ContentSettingImageModel::CreateContentSettingImageModel(
          CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_FALSE(content_setting_image_model->is_visible());
-  EXPECT_EQ(0, content_setting_image_model->get_icon());
+  EXPECT_TRUE(content_setting_image_model->icon().IsEmpty());
   EXPECT_TRUE(content_setting_image_model->get_tooltip().empty());
 
   net::CookieOptions options;
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
                                     options,
                                     false);
   content_setting_image_model->UpdateFromWebContents(web_contents());
   EXPECT_TRUE(content_setting_image_model->is_visible());
-  EXPECT_NE(0, content_setting_image_model->get_icon());
+  EXPECT_FALSE(content_setting_image_model->icon().IsEmpty());
   EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());
 }
 
 // Regression test for http://crbug.com/161854.
 TEST_F(ContentSettingImageModelTest, NULLTabSpecificContentSettings) {
   scoped_ptr<ContentSettingImageModel> content_setting_image_model(
      ContentSettingImageModel::CreateContentSettingImageModel(
          CONTENT_SETTINGS_TYPE_IMAGES));
   NotificationForwarder forwarder(content_setting_image_model.get());
   // Should not crash.
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   forwarder.clear();
 }
 
 }  // namespace