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

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Repair merge to head Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
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 9c99a490dc19ebbe990fc2bddcb750026c61b881..8b951e3df24719fe5547dd0efdcdaf281032dc22 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
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/utf_string_conversions.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/prerender/prerender_manager.h"
@@ -47,6 +48,22 @@ TEST_F(ContentSettingImageModelTest, UpdateFromWebContents) {
EXPECT_FALSE(content_setting_image_model->get_tooltip().empty());
}
+TEST_F(ContentSettingImageModelTest, RPHUpdateFromWebContents) {
+ scoped_ptr<ContentSettingImageModel> content_setting_image_model(
+ ContentSettingImageModel::CreateContentSettingImageModel(
+ CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS));
+ content_setting_image_model->UpdateFromWebContents(contents());
+ EXPECT_FALSE(content_setting_image_model->is_visible());
+
+ TabSpecificContentSettings* content_settings =
+ tab_contents()->content_settings();
+ content_settings->set_pending_protocol_handler(
+ ProtocolHandler::CreateProtocolHandler(
+ "mailto", GURL("http://www.google.com/"), ASCIIToUTF16("Handler")));
+ content_setting_image_model->UpdateFromWebContents(contents());
+ EXPECT_TRUE(content_setting_image_model->is_visible());
+}
+
TEST_F(ContentSettingImageModelTest, CookieAccessed) {
TabSpecificContentSettings* content_settings =
tab_contents()->content_settings();

Powered by Google App Engine
This is Rietveld 408576698