Skip to content

GitLab

T
tangled
Commit 2b4b718d authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot
Browse files
Options

Renaming unit_test class MockHTMLResourcePreloader to not collide. 

CSSPreloadScannerTest and HTMLPreloadScannerTest
both use a local MockHTMLResourcePreloader class for
testing. That is normally no big deal but in jumbo builds they
can be compiled in the same translation unit and then the classes
will collide. This patch gives the classes unique prefixes.

R=fs@opera.com

Change-Id: I29cd360e919c6b708a6021b6930b3347e5ae8194
Reviewed-on: https://chromium-review.googlesource.com/574707
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: default avatarCharlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487242}
parent 3775f2c6
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
third_party/WebKit/Source/core/html/parser/CSSPreloadScannerTest.cpp
View file @ 2b4b718d
......@@ -25,12 +25,12 @@ namespace blink {
namespace {
class MockHTMLResourcePreloader : public HTMLResourcePreloader {
WTF_MAKE_NONCOPYABLE(MockHTMLResourcePreloader);
class CSSMockHTMLResourcePreloader : public HTMLResourcePreloader {
WTF_MAKE_NONCOPYABLE(CSSMockHTMLResourcePreloader);
public:
explicit MockHTMLResourcePreloader(Document& document,
const char* expected_referrer = nullptr)
explicit CSSMockHTMLResourcePreloader(Document& document,
const char* expected_referrer = nullptr)
: HTMLResourcePreloader(document),
expected_referrer_(expected_referrer) {}
......@@ -78,8 +78,8 @@ TEST_F(CSSPreloadScannerTest, ScanFromResourceClient) {
.GetSettings()
->SetCSSExternalScannerNoPreload(true);
MockHTMLResourcePreloader* preloader =
new MockHTMLResourcePreloader(dummy_page_holder->GetDocument());
CSSMockHTMLResourcePreloader* preloader =
new CSSMockHTMLResourcePreloader(dummy_page_holder->GetDocument());
KURL url(kParsedURLString, "http://127.0.0.1/foo.css");
CSSStyleSheetResource* resource =
......@@ -106,8 +106,8 @@ TEST_F(CSSPreloadScannerTest, DestroyClientBeforeDataSent) {
.GetSettings()
->SetCSSExternalScannerNoPreload(true);
Persistent<MockHTMLResourcePreloader> preloader =
new MockHTMLResourcePreloader(dummy_page_holder->GetDocument());
Persistent<CSSMockHTMLResourcePreloader> preloader =
new CSSMockHTMLResourcePreloader(dummy_page_holder->GetDocument());
KURL url(kParsedURLString, "http://127.0.0.1/foo.css");
Persistent<CSSStyleSheetResource> resource =
......@@ -133,8 +133,8 @@ TEST_F(CSSPreloadScannerTest, DontReadFromClearedData) {
.GetSettings()
->SetCSSExternalScannerNoPreload(true);
MockHTMLResourcePreloader* preloader =
new MockHTMLResourcePreloader(dummy_page_holder->GetDocument());
CSSMockHTMLResourcePreloader* preloader =
new CSSMockHTMLResourcePreloader(dummy_page_holder->GetDocument());
KURL url(kParsedURLString, "http://127.0.0.1/foo.css");
CSSStyleSheetResource* resource =
......@@ -161,8 +161,8 @@ TEST_F(CSSPreloadScannerTest, DoNotExpectValidDocument) {
.GetSettings()
->SetCSSExternalScannerNoPreload(true);
MockHTMLResourcePreloader* preloader =
new MockHTMLResourcePreloader(dummy_page_holder->GetDocument());
CSSMockHTMLResourcePreloader* preloader =
new CSSMockHTMLResourcePreloader(dummy_page_holder->GetDocument());
KURL url(kParsedURLString, "http://127.0.0.1/foo.css");
CSSStyleSheetResource* resource =
......@@ -188,7 +188,7 @@ TEST_F(CSSPreloadScannerTest, ReferrerPolicyHeader) {
dummy_page_holder->GetDocument().GetSettings()->SetCSSExternalScannerPreload(
true);
MockHTMLResourcePreloader* preloader = new MockHTMLResourcePreloader(
CSSMockHTMLResourcePreloader* preloader = new CSSMockHTMLResourcePreloader(
dummy_page_holder->GetDocument(), "http://127.0.0.1/foo.css");
KURL url(kParsedURLString, "http://127.0.0.1/foo.css");
......
third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp
View file @ 2b4b718d
......@@ -66,7 +66,7 @@ struct ContextTestCase {
bool is_image_set;
};
class MockHTMLResourcePreloader : public ResourcePreloader {
class HTMLMockHTMLResourcePreloader : public ResourcePreloader {
public:
void PreloadRequestVerification(Resource::Type type,
const char* url,
......@@ -212,7 +212,7 @@ class HTMLPreloadScannerTest : public ::testing::Test {
void SetUp() override { RunSetUp(kViewportEnabled); }
void Test(PreloadScannerTestCase test_case) {
MockHTMLResourcePreloader preloader;
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(kParsedURLString, test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests = scanner_->Scan(base_url, nullptr);
......@@ -224,7 +224,7 @@ class HTMLPreloadScannerTest : public ::testing::Test {
}
void Test(HTMLPreconnectTestCase test_case) {
MockHTMLResourcePreloader preloader;
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(kParsedURLString, test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests = scanner_->Scan(base_url, nullptr);
......@@ -234,7 +234,7 @@ class HTMLPreloadScannerTest : public ::testing::Test {
}
void Test(ReferrerPolicyTestCase test_case) {
MockHTMLResourcePreloader preloader;
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(kParsedURLString, test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests = scanner_->Scan(base_url, nullptr);
......@@ -253,7 +253,7 @@ class HTMLPreloadScannerTest : public ::testing::Test {
}
void Test(NonceTestCase test_case) {
MockHTMLResourcePreloader preloader;
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(kParsedURLString, test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests = scanner_->Scan(base_url, nullptr);
......@@ -263,7 +263,7 @@ class HTMLPreloadScannerTest : public ::testing::Test {
}
void Test(ContextTestCase test_case) {
MockHTMLResourcePreloader preloader;
HTMLMockHTMLResourcePreloader preloader;
KURL base_url(kParsedURLString, test_case.base_url);
scanner_->AppendToEnd(String(test_case.input_html));
PreloadRequestStream requests = scanner_->Scan(base_url, nullptr);
......
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