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

Unified Diff: chrome/browser/subresource_filter/subresource_filter_browsertest.cc

Issue 2936233004: [subresource_filter] Use constexpr for subresource filter dev tools messages. (Closed)
Patch Set: Added include sstream Created 3 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
« no previous file with comments | « no previous file | components/subresource_filter/core/browser/subresource_filter_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/subresource_filter/subresource_filter_browsertest.cc
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
index 8eb565c528895a579ba0c73b57c58e9718e15933..ab478859444917b94d27b03c3d7aef3f1d70dc28 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -4,6 +4,7 @@
#include <map>
#include <memory>
+#include <sstream>
#include <string>
#include "base/bind.h"
@@ -544,8 +545,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
}
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) {
- content::ConsoleObserverDelegate console_observer(
- web_contents(), kDisallowSubframeConsoleMessage + "*");
+ std::ostringstream message_filter;
+ message_filter << kDisallowSubframeConsoleMessage << "*";
+ content::ConsoleObserverDelegate console_observer(web_contents(),
+ message_filter.str());
web_contents()->SetDelegate(&console_observer);
GURL url(GetTestUrl(kTestFrameSetPath));
@@ -564,15 +567,17 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) {
1);
// Console message for subframe blocking should be displayed.
- EXPECT_TRUE(base::MatchPattern(
- console_observer.message(),
- kDisallowSubframeConsoleMessage + "*included_script.js*"));
+ std::ostringstream result;
+ result << kDisallowSubframeConsoleMessage << "*included_script.js*";
+ EXPECT_TRUE(base::MatchPattern(console_observer.message(), result.str()));
}
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
ActivationDisabled_NoConsoleMessage) {
- content::ConsoleObserverDelegate console_observer(
- web_contents(), kDisallowSubframeConsoleMessage + "*");
+ std::ostringstream message_filter;
+ message_filter << kDisallowSubframeConsoleMessage << "*";
+ content::ConsoleObserverDelegate console_observer(web_contents(),
+ message_filter.str());
web_contents()->SetDelegate(&console_observer);
Configuration config(
@@ -594,8 +599,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
ActivationDryRun_NoConsoleMessage) {
- content::ConsoleObserverDelegate console_observer(
- web_contents(), kDisallowSubframeConsoleMessage + "*");
+ std::ostringstream message_filter;
+ message_filter << kDisallowSubframeConsoleMessage << "*";
+ content::ConsoleObserverDelegate console_observer(web_contents(),
+ message_filter.str());
web_contents()->SetDelegate(&console_observer);
Configuration config(
« no previous file with comments | « no previous file | components/subresource_filter/core/browser/subresource_filter_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698