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

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

Issue 2814733002: Add the SocEng as a type for checking in CheckUrlForSubresourceFilter. (Closed)
Patch Set: some engedy@ comments Created 3 years, 8 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/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 6b9c9acb91401aa69555b89593720bca1517e035..4ad22a56a2aa035926d27ef8a2d09c02b4d73353 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -112,14 +112,12 @@ constexpr const char kEvaluationWallDuration[] =
constexpr const char kEvaluationCPUDuration[] =
"SubresourceFilter.SubresourceLoad.Evaluation.CPUDuration";
-#if defined(GOOGLE_CHROME_BUILD)
// Names of navigation chain patterns histogram.
const char kMatchesPatternHistogramName[] =
"SubresourceFilter.PageLoad.RedirectChainMatchPattern";
const char kNavigationChainSize[] =
"SubresourceFilter.PageLoad.RedirectChainLength";
const char kSubresourceFilterOnlySuffix[] = ".SubresourceFilterOnly";
-#endif
// Other histograms.
const char kSubresourceFilterActionsHistogram[] = "SubresourceFilter.Actions";
@@ -468,7 +466,6 @@ class SubresourceFilterWebSocketBrowserTest
std::unique_ptr<net::SpawnedTestServer> websocket_test_server_;
};
-#if defined(GOOGLE_CHROME_BUILD)
class SubresourceFilterListBrowserTest
: public SubresourceFilterBrowserTestImpl {
public:
@@ -482,7 +479,6 @@ class SubresourceFilterListBrowserTest
"" /* suppress_notifications */, "false"));
}
};
-#endif
// Tests -----------------------------------------------------------------------
@@ -505,7 +501,6 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, MainFrameActivation) {
EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
}
-#if defined(GOOGLE_CHROME_BUILD)
IN_PROC_BROWSER_TEST_F(SubresourceFilterListBrowserTest, MainFrameActivation) {
GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
ConfigureAsSubresourceFilterOnlyURL(url);
@@ -524,7 +519,6 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterListBrowserTest, MainFrameActivation) {
ui_test_utils::NavigateToURL(browser(), url);
EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
}
-#endif
// There should be no document-level de-/reactivation happening on the renderer
// side as a result of a same document navigation.
@@ -1298,9 +1292,6 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterWhitelistSiteOnReloadBrowserTest,
static_cast<int>(ActivationDecision::URL_WHITELISTED), 1);
}
-#if defined(GOOGLE_CHROME_BUILD)
-// This test is only enabled when GOOGLE_CHROME_BUILD is true because the store
-// that this test uses is only populated on GOOGLE_CHROME_BUILD builds.
IN_PROC_BROWSER_TEST_F(
SubresourceFilterBrowserTest,
ExpectRedirectPatternHistogramsAreRecordedForSubresourceFilterOnlyMatch) {
@@ -1345,6 +1336,5 @@ IN_PROC_BROWSER_TEST_F(
std::string(kSubresourceFilterOnlySuffix)),
::testing::IsEmpty());
}
-#endif
} // namespace subresource_filter

Powered by Google App Engine
This is Rietveld 408576698