| Index: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
|
| 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 190335e82e760db5eab0661d6d0b3c419932ac66..720cef721cc1c3a394f559f660e15ab8fe64d1e3 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
|
| @@ -66,9 +66,9 @@ TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {
|
| TabSpecificContentSettings::CreateForWebContents(web_contents());
|
| TabSpecificContentSettings* content_settings =
|
| TabSpecificContentSettings::FromWebContents(web_contents());
|
| - scoped_ptr<ContentSettingImageModel> content_setting_image_model =
|
| - ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| - CONTENT_SETTINGS_TYPE_IMAGES);
|
| + std::unique_ptr<ContentSettingImageModel> content_setting_image_model =
|
| + ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| + CONTENT_SETTINGS_TYPE_IMAGES);
|
| EXPECT_FALSE(content_setting_image_model->is_visible());
|
| EXPECT_TRUE(content_setting_image_model->get_tooltip().empty());
|
|
|
| @@ -82,9 +82,9 @@ TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {
|
|
|
| TEST_F(ContentSettingImageModelTest, RPHUpdateFromWebContents) {
|
| TabSpecificContentSettings::CreateForWebContents(web_contents());
|
| - scoped_ptr<ContentSettingImageModel> content_setting_image_model =
|
| - ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| - CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS);
|
| + std::unique_ptr<ContentSettingImageModel> content_setting_image_model =
|
| + ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| + CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS);
|
| content_setting_image_model->UpdateFromWebContents(web_contents());
|
| EXPECT_FALSE(content_setting_image_model->is_visible());
|
|
|
| @@ -104,9 +104,9 @@ TEST_F(ContentSettingImageModelTest, CookieAccessed) {
|
| HostContentSettingsMapFactory::GetForProfile(profile())
|
| ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
|
| CONTENT_SETTING_BLOCK);
|
| - scoped_ptr<ContentSettingImageModel> content_setting_image_model(
|
| - ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| - CONTENT_SETTINGS_TYPE_COOKIES));
|
| + std::unique_ptr<ContentSettingImageModel> content_setting_image_model(
|
| + ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| + CONTENT_SETTINGS_TYPE_COOKIES));
|
| EXPECT_FALSE(content_setting_image_model->is_visible());
|
| EXPECT_TRUE(content_setting_image_model->get_tooltip().empty());
|
|
|
| @@ -124,9 +124,9 @@ TEST_F(ContentSettingImageModelTest, CookieAccessed) {
|
|
|
| // Regression test for http://crbug.com/161854.
|
| TEST_F(ContentSettingImageModelTest, NULLTabSpecificContentSettings) {
|
| - scoped_ptr<ContentSettingImageModel> content_setting_image_model =
|
| - ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| - CONTENT_SETTINGS_TYPE_IMAGES);
|
| + std::unique_ptr<ContentSettingImageModel> content_setting_image_model =
|
| + ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
|
| + CONTENT_SETTINGS_TYPE_IMAGES);
|
| NotificationForwarder forwarder(content_setting_image_model.get());
|
| // Should not crash.
|
| TabSpecificContentSettings::CreateForWebContents(web_contents());
|
|
|