Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1562)

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/chrome_notification_types.h" 6 #include "chrome/browser/chrome_notification_types.h"
7 #include "chrome/browser/content_settings/host_content_settings_map.h" 7 #include "chrome/browser/content_settings/host_content_settings_map.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 scoped_ptr<ContentSettingImageModel> content_setting_image_model( 79 scoped_ptr<ContentSettingImageModel> content_setting_image_model(
80 ContentSettingImageModel::CreateContentSettingImageModel( 80 ContentSettingImageModel::CreateContentSettingImageModel(
81 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)); 81 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS));
82 content_setting_image_model->UpdateFromWebContents(web_contents()); 82 content_setting_image_model->UpdateFromWebContents(web_contents());
83 EXPECT_FALSE(content_setting_image_model->is_visible()); 83 EXPECT_FALSE(content_setting_image_model->is_visible());
84 84
85 TabSpecificContentSettings* content_settings = 85 TabSpecificContentSettings* content_settings =
86 TabSpecificContentSettings::FromWebContents(web_contents()); 86 TabSpecificContentSettings::FromWebContents(web_contents());
87 content_settings->set_pending_protocol_handler( 87 content_settings->set_pending_protocol_handler(
88 ProtocolHandler::CreateProtocolHandler( 88 ProtocolHandler::CreateProtocolHandler(
89 "mailto", GURL("http://www.google.com/"), ASCIIToUTF16("Handler"))); 89 "mailto", GURL("http://www.google.com/"),
90 base::ASCIIToUTF16("Handler")));
90 content_setting_image_model->UpdateFromWebContents(web_contents()); 91 content_setting_image_model->UpdateFromWebContents(web_contents());
91 EXPECT_TRUE(content_setting_image_model->is_visible()); 92 EXPECT_TRUE(content_setting_image_model->is_visible());
92 } 93 }
93 94
94 TEST_F(ContentSettingImageModelTest, CookieAccessed) { 95 TEST_F(ContentSettingImageModelTest, CookieAccessed) {
95 TabSpecificContentSettings::CreateForWebContents(web_contents()); 96 TabSpecificContentSettings::CreateForWebContents(web_contents());
96 TabSpecificContentSettings* content_settings = 97 TabSpecificContentSettings* content_settings =
97 TabSpecificContentSettings::FromWebContents(web_contents()); 98 TabSpecificContentSettings::FromWebContents(web_contents());
98 profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( 99 profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
99 CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); 100 CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);
(...skipping 21 matching lines...) Expand all
121 scoped_ptr<ContentSettingImageModel> content_setting_image_model( 122 scoped_ptr<ContentSettingImageModel> content_setting_image_model(
122 ContentSettingImageModel::CreateContentSettingImageModel( 123 ContentSettingImageModel::CreateContentSettingImageModel(
123 CONTENT_SETTINGS_TYPE_IMAGES)); 124 CONTENT_SETTINGS_TYPE_IMAGES));
124 NotificationForwarder forwarder(content_setting_image_model.get()); 125 NotificationForwarder forwarder(content_setting_image_model.get());
125 // Should not crash. 126 // Should not crash.
126 TabSpecificContentSettings::CreateForWebContents(web_contents()); 127 TabSpecificContentSettings::CreateForWebContents(web_contents());
127 forwarder.clear(); 128 forwarder.clear();
128 } 129 }
129 130
130 } // namespace 131 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698