Commit a5f61f79 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Renaming unit_test class MockLocalFrameClient to not collide.

Both FrameFetchContextTest and MixedContentCheckerTest deckare a class
named MockLocalFrameClient. That is normally no big deal
but in jumbo builds they can be compiled in the same translation unit
and then the functions will collide. This patch adds a prefix to
the class names to make them more unique.

R=fs@opera.com

Change-Id: I215f7edafa2fa0b229dc5847a1e158df825e8c27
Reviewed-on: https://chromium-review.googlesource.com/574708Reviewed-by: default avatarFredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487140}
parent 8d3790eb
......@@ -82,9 +82,9 @@ class StubLocalFrameClientWithParent final : public EmptyLocalFrameClient {
Member<Frame> parent_;
};
class MockLocalFrameClient : public EmptyLocalFrameClient {
class FrameFetchContextMockLocalFrameClient : public EmptyLocalFrameClient {
public:
MockLocalFrameClient() : EmptyLocalFrameClient() {}
FrameFetchContextMockLocalFrameClient() : EmptyLocalFrameClient() {}
MOCK_METHOD1(DidDisplayContentWithCertificateErrors, void(const KURL&));
MOCK_METHOD2(DispatchDidLoadResourceFromMemoryCache,
void(const ResourceRequest&, const ResourceResponse&));
......@@ -215,7 +215,7 @@ class FrameFetchContextMockedLocalFrameClientTest
void SetUp() override {
url = KURL(NullURL(), "https://example.test/foo");
main_resource_url = KURL(NullURL(), "https://www.example.test");
client = new ::testing::NiceMock<MockLocalFrameClient>();
client = new ::testing::NiceMock<FrameFetchContextMockLocalFrameClient>();
dummy_page_holder =
DummyPageHolder::Create(IntSize(500, 500), nullptr, client);
dummy_page_holder->GetPage().SetDeviceScaleFactorDeprecated(1.0);
......@@ -230,7 +230,7 @@ class FrameFetchContextMockedLocalFrameClientTest
KURL url;
KURL main_resource_url;
Persistent<::testing::NiceMock<MockLocalFrameClient>> client;
Persistent<::testing::NiceMock<FrameFetchContextMockLocalFrameClient>> client;
};
class FrameFetchContextModifyRequestTest : public FrameFetchContextTest {
......
......@@ -105,9 +105,9 @@ TEST(MixedContentCheckerTest, ContextTypeForInspector) {
namespace {
class MockLocalFrameClient : public EmptyLocalFrameClient {
class MixedContentCheckerMockLocalFrameClient : public EmptyLocalFrameClient {
public:
MockLocalFrameClient() : EmptyLocalFrameClient() {}
MixedContentCheckerMockLocalFrameClient() : EmptyLocalFrameClient() {}
MOCK_METHOD0(DidContainInsecureFormAction, void());
MOCK_METHOD1(DidDisplayContentWithCertificateErrors, void(const KURL&));
MOCK_METHOD1(DidRunContentWithCertificateErrors, void(const KURL&));
......@@ -116,7 +116,8 @@ class MockLocalFrameClient : public EmptyLocalFrameClient {
} // namespace
TEST(MixedContentCheckerTest, HandleCertificateError) {
MockLocalFrameClient* client = new MockLocalFrameClient;
MixedContentCheckerMockLocalFrameClient* client =
new MixedContentCheckerMockLocalFrameClient;
std::unique_ptr<DummyPageHolder> dummy_page_holder =
DummyPageHolder::Create(IntSize(1, 1), nullptr, client);
......@@ -149,7 +150,8 @@ TEST(MixedContentCheckerTest, HandleCertificateError) {
}
TEST(MixedContentCheckerTest, DetectMixedForm) {
MockLocalFrameClient* client = new MockLocalFrameClient;
MixedContentCheckerMockLocalFrameClient* client =
new MixedContentCheckerMockLocalFrameClient;
std::unique_ptr<DummyPageHolder> dummy_page_holder =
DummyPageHolder::Create(IntSize(1, 1), nullptr, client);
......
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