| Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp
|
| index 9e23fdb666fbfd44d5811074783654e70bf158d7..e6a48d1a4fe199b800d91e6763ec6048d233527a 100644
|
| --- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp
|
| @@ -39,7 +39,6 @@
|
| #include "platform/loader/fetch/FetchInitiatorInfo.h"
|
| #include "platform/loader/fetch/FetchInitiatorTypeNames.h"
|
| #include "platform/loader/fetch/FetchRequest.h"
|
| -#include "platform/loader/fetch/FetchTestingPlatformSupport.h"
|
| #include "platform/loader/fetch/MemoryCache.h"
|
| #include "platform/loader/fetch/MockFetchContext.h"
|
| #include "platform/loader/fetch/MockResource.h"
|
| @@ -50,7 +49,7 @@
|
| #include "platform/network/ResourceRequest.h"
|
| #include "platform/network/ResourceTimingInfo.h"
|
| #include "platform/scheduler/test/fake_web_task_runner.h"
|
| -#include "platform/testing/TestingPlatformSupport.h"
|
| +#include "platform/testing/FetchTestingPlatformSupport.h"
|
| #include "platform/testing/URLTestHelpers.h"
|
| #include "platform/testing/UnitTestHelpers.h"
|
| #include "platform/testing/weburl_loader_mock.h"
|
| @@ -647,14 +646,13 @@ TEST_F(ResourceFetcherTest, LinkPreloadResourceMultipleFetchersAndMove) {
|
| Resource* resource = MockResource::fetch(fetchRequestOriginal, fetcher);
|
| ASSERT_TRUE(resource);
|
| EXPECT_TRUE(resource->isLinkPreload());
|
| - EXPECT_FALSE(fetcher->isFetching());
|
| fetcher->preloadStarted(resource);
|
|
|
| // Resource created by parser on the second fetcher
|
| FetchRequest fetchRequest2 = FetchRequest(url, FetchInitiatorInfo());
|
| Resource* newResource2 = MockResource::fetch(fetchRequest2, fetcher2);
|
| Persistent<MockResourceClient> client2 = new MockResourceClient(newResource2);
|
| - EXPECT_NE(resource, newResource2);
|
| + EXPECT_EQ(resource, newResource2);
|
| EXPECT_FALSE(fetcher2->isFetching());
|
| Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
|
| }
|
|
|