Commit 72e90130 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] disambiguate MockPlatform class

https://chromium-review.googlesource.com/c/chromium/src/+/893401 added
a MockPlatform class in SourceKeyedCachedMetadataHandlerTest.cpp which
conflicts in jumbo builds with ResourceTest.cpp.  Let's rename one.

TBR=japhet@chromium.org

Bug: chromium:823663
Change-Id: I044cf979281fe4009601c3024139c57435fb4762
Reviewed-on: https://chromium-review.googlesource.com/992235
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: default avatarHiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547795}
parent 3ceb5e5e
...@@ -79,10 +79,11 @@ struct CacheMetadataEntry { ...@@ -79,10 +79,11 @@ struct CacheMetadataEntry {
}; };
// Mock Platform implementation that provides basic crypto and caching. // Mock Platform implementation that provides basic crypto and caching.
class MockPlatform final : public TestingPlatformSupportWithMockScheduler { class SourceKeyedCachedMetadataHandlerMockPlatform final
: public TestingPlatformSupportWithMockScheduler {
public: public:
MockPlatform() {} SourceKeyedCachedMetadataHandlerMockPlatform() {}
~MockPlatform() override = default; ~SourceKeyedCachedMetadataHandlerMockPlatform() override = default;
WebCrypto* Crypto() override { return &mock_web_crypto_; } WebCrypto* Crypto() override { return &mock_web_crypto_; }
...@@ -196,7 +197,8 @@ template <size_t N> ...@@ -196,7 +197,8 @@ template <size_t N>
TEST(SourceKeyedCachedMetadataHandlerTest, TEST(SourceKeyedCachedMetadataHandlerTest,
HandlerForSource_InitiallyNonNullHandlersWithNullData) { HandlerForSource_InitiallyNonNullHandlersWithNullData) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -219,7 +221,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, ...@@ -219,7 +221,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest,
TEST(SourceKeyedCachedMetadataHandlerTest, TEST(SourceKeyedCachedMetadataHandlerTest,
HandlerForSource_OneHandlerSetOtherNull) { HandlerForSource_OneHandlerSetOtherNull) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -245,7 +248,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, ...@@ -245,7 +248,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest,
} }
TEST(SourceKeyedCachedMetadataHandlerTest, HandlerForSource_BothHandlersSet) { TEST(SourceKeyedCachedMetadataHandlerTest, HandlerForSource_BothHandlersSet) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -274,7 +278,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, HandlerForSource_BothHandlersSet) { ...@@ -274,7 +278,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, HandlerForSource_BothHandlersSet) {
} }
TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EmptyClearDoesSend) { TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EmptyClearDoesSend) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -292,7 +297,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EmptyClearDoesSend) { ...@@ -292,7 +297,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EmptyClearDoesSend) {
} }
TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EachSetDoesSend) { TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EachSetDoesSend) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -321,7 +327,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EachSetDoesSend) { ...@@ -321,7 +327,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_EachSetDoesSend) {
} }
TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_SetWithNoSendDoesNotSend) { TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_SetWithNoSendDoesNotSend) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
SourceKeyedCachedMetadataHandler* handler = SourceKeyedCachedMetadataHandler* handler =
...@@ -352,7 +359,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_SetWithNoSendDoesNotSend) { ...@@ -352,7 +359,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, Serialize_SetWithNoSendDoesNotSend) {
TEST(SourceKeyedCachedMetadataHandlerTest, TEST(SourceKeyedCachedMetadataHandlerTest,
SerializeAndDeserialize_NoHandlersSet) { SerializeAndDeserialize_NoHandlersSet) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
WTF::String source1("source1"); WTF::String source1("source1");
...@@ -397,7 +405,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest, ...@@ -397,7 +405,8 @@ TEST(SourceKeyedCachedMetadataHandlerTest,
TEST(SourceKeyedCachedMetadataHandlerTest, TEST(SourceKeyedCachedMetadataHandlerTest,
SerializeAndDeserialize_BothHandlersSet) { SerializeAndDeserialize_BothHandlersSet) {
ScopedTestingPlatformSupport<MockPlatform> platform; ScopedTestingPlatformSupport<SourceKeyedCachedMetadataHandlerMockPlatform>
platform;
KURL url("http://SourceKeyedCachedMetadataHandlerTest.com"); KURL url("http://SourceKeyedCachedMetadataHandlerTest.com");
WTF::String source1("source1"); WTF::String source1("source1");
......
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