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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1233313005: Move elide_url to its own component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to static library Created 5 years, 5 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
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/elide_url.h » ('j') | components/secure_display.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 943693c9e5d7235d880139ad3fd643d07e23ed65..e9b8d2921cf8e2e4c929fce1cf904fafc27033ad 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
-#include "chrome/browser/ui/elide_url.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
@@ -22,6 +21,7 @@
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/infobars/core/infobar_delegate.h"
+#include "components/secure_display/elide_url.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/web_contents_tester.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -118,9 +118,9 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
EXPECT_EQ(bubble_content_2.radio_group.radio_items[1],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_COOKIES_BLOCK,
- FormatUrlForSecurityDisplay(web_contents()->GetURL(),
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ web_contents()->GetURL(), profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_FALSE(bubble_content_2.custom_link.empty());
EXPECT_TRUE(bubble_content_2.custom_link_enabled);
EXPECT_FALSE(bubble_content_2.manage_link.empty());
@@ -157,9 +157,9 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
EXPECT_EQ(bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK));
@@ -542,9 +542,9 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
EXPECT_EQ(bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_BLOCK));
@@ -576,9 +576,9 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_BLOCKED_MEDIASTREAM_MIC_ASK,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_BLOCKED_MEDIASTREAM_MIC_NO_ACTION));
@@ -621,9 +621,9 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
EXPECT_EQ(bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_ALLOWED_MEDIASTREAM_CAMERA_BLOCK));
@@ -655,9 +655,9 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_BLOCKED_MEDIASTREAM_CAMERA_NO_ACTION));
@@ -702,9 +702,9 @@ TEST_F(ContentSettingBubbleModelTest, AccumulateMediastreamMicAndCamera) {
EXPECT_EQ(bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_BLOCK));
@@ -734,9 +734,9 @@ TEST_F(ContentSettingBubbleModelTest, AccumulateMediastreamMicAndCamera) {
EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
l10n_util::GetStringFUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION,
- FormatUrlForSecurityDisplay(security_origin,
- profile()->GetPrefs()->GetString(
- prefs::kAcceptLanguages))));
+ secure_display::FormatUrlForSecurityDisplay(
+ security_origin, profile()->GetPrefs()->GetString(
+ prefs::kAcceptLanguages))));
EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
l10n_util::GetStringUTF8(
IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK));
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/elide_url.h » ('j') | components/secure_display.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698