Skip to content

GitLab

T
tangled
Commit fd0a8309 authored by Eric Robinson's avatar Eric Robinson Committed by Commit Bot
Browse files
Options

AdTracker tests of resource marking for images, frames. 

This CL adds tests to the AdTracker to verify that resources loaded
by an ad script are marked properly ad ads during loaded.  This
does not work properly for images currently due to crbug.com/848916.

Bug: 848916, 863446
Change-Id: I6643ec24c16ec7dceb9c60fd150046b86cb008ac
Reviewed-on: https://chromium-review.googlesource.com/1140196Reviewed-by: default avatarJosh Karlin <jkarlin@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Eric Robinson <ericrobinson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580192}
parent 1acbd956
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 9 deletions
third_party/blink/renderer/core/frame/ad_tracker_test.cc
View file @ fd0a8309
...@@ -34,6 +34,11 @@ class TestAdTracker : public AdTracker { ...@@ -34,6 +34,11 @@ class TestAdTracker : public AdTracker {
AdTracker::Trace(visitor); AdTracker::Trace(visitor);
} }
bool RequestWithUrlTaggedAsAd(const String& url) const {
DCHECK(is_ad_.Contains(url));
return is_ad_.at(url);
}
protected: protected:
String ScriptAtTopOfStack(ExecutionContext* execution_context) override { String ScriptAtTopOfStack(ExecutionContext* execution_context) override {
if (script_at_top_.IsEmpty()) if (script_at_top_.IsEmpty())
...@@ -63,9 +68,12 @@ class TestAdTracker : public AdTracker { ...@@ -63,9 +68,12 @@ class TestAdTracker : public AdTracker {
AdTracker::WillSendRequest(execution_context, identifier, document_loader, AdTracker::WillSendRequest(execution_context, identifier, document_loader,
resource_request, redirect_response, resource_request, redirect_response,
fetch_initiator_info, resource_type); fetch_initiator_info, resource_type);
is_ad_.insert(resource_request.Url().GetString(),
resource_request.IsAdResource());
} }
private: private:
HashMap<String, bool> is_ad_;
String script_at_top_; String script_at_top_;
Member<ExecutionContext> execution_context_; Member<ExecutionContext> execution_context_;
String ad_suffix_; String ad_suffix_;
...@@ -179,11 +187,12 @@ class AdTrackerSimTest : public SimTest { ...@@ -179,11 +187,12 @@ class AdTrackerSimTest : public SimTest {
Persistent<TestAdTracker> ad_tracker_; Persistent<TestAdTracker> ad_tracker_;
}; };
// Resources loaded by ad script are tagged as ads. // Script loaded by ad script is tagged as ad.
TEST_F(AdTrackerSimTest, ResourceLoadedWhileExecutingAdScript) { TEST_F(AdTrackerSimTest, ScriptLoadedWhileExecutingAdScript) {
SimRequest ad_resource("https://example.com/ad_script.js", "text/javascript"); const char kAdUrl[] = "https://example.com/ad_script.js";
SimRequest vanilla_script("https://example.com/vanilla_script.js", const char kVanillaUrl[] = "https://example.com/vanilla_script.js";
"text/javascript"); SimRequest ad_resource(kAdUrl, "text/javascript");
SimRequest vanilla_script(kVanillaUrl, "text/javascript");
ad_tracker_->SetAdSuffix("ad_script.js"); ad_tracker_->SetAdSuffix("ad_script.js");
...@@ -196,10 +205,57 @@ TEST_F(AdTrackerSimTest, ResourceLoadedWhileExecutingAdScript) { ...@@ -196,10 +205,57 @@ TEST_F(AdTrackerSimTest, ResourceLoadedWhileExecutingAdScript) {
)SCRIPT"); )SCRIPT");
vanilla_script.Complete(""); vanilla_script.Complete("");
EXPECT_TRUE(IsKnownAdScript(&GetDocument(), EXPECT_TRUE(IsKnownAdScript(&GetDocument(), kAdUrl));
String("https://example.com/ad_script.js"))); EXPECT_TRUE(IsKnownAdScript(&GetDocument(), kVanillaUrl));
EXPECT_TRUE(IsKnownAdScript(&GetDocument(), EXPECT_TRUE(ad_tracker_->RequestWithUrlTaggedAsAd(kAdUrl));
String("https://example.com/vanilla_script.js"))); EXPECT_TRUE(ad_tracker_->RequestWithUrlTaggedAsAd(kVanillaUrl));
}
// Image loaded by ad script is tagged as ad.
TEST_F(AdTrackerSimTest, ImageLoadedWhileExecutingAdScript) {
const char kAdUrl[] = "https://example.com/ad_script.js";
const char kVanillaUrl[] = "https://example.com/vanilla_image.jpg";
SimRequest ad_resource(kAdUrl, "text/javascript");
SimRequest vanilla_image(kVanillaUrl, "image/jpeg");
ad_tracker_->SetAdSuffix("ad_script.js");
main_resource_->Complete("<body></body><script src=ad_script.js></script>");
ad_resource.Complete(R"SCRIPT(
image = document.createElement("img");
image.src = "vanilla_image.jpg";
document.body.appendChild(image);
)SCRIPT");
vanilla_image.Complete("");
EXPECT_TRUE(IsKnownAdScript(&GetDocument(), kAdUrl));
EXPECT_TRUE(ad_tracker_->RequestWithUrlTaggedAsAd(kAdUrl));
// TODO(crbug.com/848916): Should be true.
EXPECT_FALSE(ad_tracker_->RequestWithUrlTaggedAsAd(kVanillaUrl));
}
// Frame loaded by ad script is tagged as ad.
TEST_F(AdTrackerSimTest, FrameLoadedWhileExecutingAdScript) {
const char kAdUrl[] = "https://example.com/ad_script.js";
const char kVanillaUrl[] = "https://example.com/vanilla_page.html";
SimRequest ad_resource(kAdUrl, "text/javascript");
SimRequest vanilla_page(kVanillaUrl, "text/html");
ad_tracker_->SetAdSuffix("ad_script.js");
main_resource_->Complete("<body></body><script src=ad_script.js></script>");
ad_resource.Complete(R"SCRIPT(
iframe = document.createElement("iframe");
iframe.src = "vanilla_page.html";
document.body.appendChild(iframe);
)SCRIPT");
vanilla_page.Complete("");
EXPECT_TRUE(IsKnownAdScript(&GetDocument(), kAdUrl));
EXPECT_TRUE(ad_tracker_->RequestWithUrlTaggedAsAd(kAdUrl));
EXPECT_TRUE(ad_tracker_->RequestWithUrlTaggedAsAd(kVanillaUrl));
} }
// A script tagged as an ad in one frame shouldn't cause it to be considered // A script tagged as an ad in one frame shouldn't cause it to be considered
......
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