Commit ecbe022c authored by shivanisha's avatar shivanisha Committed by Commit Bot

[subresource_filter] Use constexpr for subresource filter dev tools messages.

BUG=724549

Review-Url: https://codereview.chromium.org/2936233004
Cr-Commit-Position: refs/heads/master@{#480854}
parent 4f1dec3a
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <sstream>
#include <string> #include <string>
#include "base/bind.h" #include "base/bind.h"
...@@ -544,8 +545,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, ...@@ -544,8 +545,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
} }
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) { IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) {
content::ConsoleObserverDelegate console_observer( std::ostringstream message_filter;
web_contents(), kDisallowSubframeConsoleMessage + "*"); message_filter << kDisallowSubframeConsoleMessage << "*";
content::ConsoleObserverDelegate console_observer(web_contents(),
message_filter.str());
web_contents()->SetDelegate(&console_observer); web_contents()->SetDelegate(&console_observer);
GURL url(GetTestUrl(kTestFrameSetPath)); GURL url(GetTestUrl(kTestFrameSetPath));
...@@ -564,15 +567,17 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) { ...@@ -564,15 +567,17 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) {
1); 1);
// Console message for subframe blocking should be displayed. // Console message for subframe blocking should be displayed.
EXPECT_TRUE(base::MatchPattern( std::ostringstream result;
console_observer.message(), result << kDisallowSubframeConsoleMessage << "*included_script.js*";
kDisallowSubframeConsoleMessage + "*included_script.js*")); EXPECT_TRUE(base::MatchPattern(console_observer.message(), result.str()));
} }
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
ActivationDisabled_NoConsoleMessage) { ActivationDisabled_NoConsoleMessage) {
content::ConsoleObserverDelegate console_observer( std::ostringstream message_filter;
web_contents(), kDisallowSubframeConsoleMessage + "*"); message_filter << kDisallowSubframeConsoleMessage << "*";
content::ConsoleObserverDelegate console_observer(web_contents(),
message_filter.str());
web_contents()->SetDelegate(&console_observer); web_contents()->SetDelegate(&console_observer);
Configuration config( Configuration config(
...@@ -594,8 +599,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, ...@@ -594,8 +599,10 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest,
ActivationDryRun_NoConsoleMessage) { ActivationDryRun_NoConsoleMessage) {
content::ConsoleObserverDelegate console_observer( std::ostringstream message_filter;
web_contents(), kDisallowSubframeConsoleMessage + "*"); message_filter << kDisallowSubframeConsoleMessage << "*";
content::ConsoleObserverDelegate console_observer(web_contents(),
message_filter.str());
web_contents()->SetDelegate(&console_observer); web_contents()->SetDelegate(&console_observer);
Configuration config( Configuration config(
......
...@@ -30,11 +30,4 @@ const base::FilePath::CharType kUnindexedRulesetLicenseFileName[] = ...@@ -30,11 +30,4 @@ const base::FilePath::CharType kUnindexedRulesetLicenseFileName[] =
const base::FilePath::CharType kUnindexedRulesetDataFileName[] = const base::FilePath::CharType kUnindexedRulesetDataFileName[] =
FILE_PATH_LITERAL("Filtering Rules"); FILE_PATH_LITERAL("Filtering Rules");
// TODO(shivanisha): Update the strings when finalized.
const std::string kActivationConsoleMessage =
"Subresource filter is activated on this site";
const std::string kDisallowSubframeConsoleMessage =
"Subresource filtering disallowed loading this resource, ";
} // namespace subresource_filter } // namespace subresource_filter
...@@ -47,11 +47,14 @@ extern const base::FilePath::CharType kUnindexedRulesetLicenseFileName[]; ...@@ -47,11 +47,14 @@ extern const base::FilePath::CharType kUnindexedRulesetLicenseFileName[];
// The name of the file that stores the unindexed filtering rules. // The name of the file that stores the unindexed filtering rules.
extern const base::FilePath::CharType kUnindexedRulesetDataFileName[]; extern const base::FilePath::CharType kUnindexedRulesetDataFileName[];
// TODO(shivanisha): Update the strings when finalized.
// Console message to be displayed on activation. // Console message to be displayed on activation.
extern const std::string kActivationConsoleMessage; constexpr char kActivationConsoleMessage[] =
"Subresource filter is activated on this site";
// Console message to be displayed on disallowing subframe. // Console message to be displayed on disallowing subframe.
extern const std::string kDisallowSubframeConsoleMessage; constexpr char kDisallowSubframeConsoleMessage[] =
"Subresource filtering disallowed loading this resource, ";
} // namespace subresource_filter } // namespace subresource_filter
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment