Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
index da6ee3cb3b02d248a301000e65fbb20f3170f543..cc438ab9bab064c914c480576f0d7dfc090fc1b4 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
@@ -80,7 +80,7 @@ public:
TestResourceFactory(Resource::Type type = Resource::Raw)
: ResourceFactory(type) { }
- PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String& charset) const override
+ RawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String& charset) const override
{
return Resource::create(request, type(), options);
}
@@ -93,7 +93,7 @@ TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
// and no resource should be present in the cache.
ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
+ RawPtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
EXPECT_EQ(resource.get(), static_cast<Resource*>(nullptr));
EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(nullptr));
}
@@ -103,7 +103,7 @@ TEST_F(ResourceFetcherTest, UseExistingResource)
ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
- RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Image);
+ RawPtr<Resource> resource = Resource::create(url, Resource::Image);
memoryCache()->add(resource.get());
ResourceResponse response;
response.setURL(url);
@@ -113,7 +113,7 @@ TEST_F(ResourceFetcherTest, UseExistingResource)
resource->finish();
FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
+ RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
EXPECT_EQ(resource, newResource);
memoryCache()->remove(resource.get());
}
@@ -121,7 +121,7 @@ TEST_F(ResourceFetcherTest, UseExistingResource)
TEST_F(ResourceFetcherTest, Vary)
{
KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
- RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Raw);
+ RawPtr<Resource> resource = Resource::create(url, Resource::Raw);
memoryCache()->add(resource.get());
ResourceResponse response;
response.setURL(url);
@@ -135,7 +135,7 @@ TEST_F(ResourceFetcherTest, Vary)
ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLResponse(), "");
- RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
+ RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
EXPECT_NE(resource, newResource);
newResource->loader()->cancel();
memoryCache()->remove(newResource.get());
@@ -151,7 +151,7 @@ TEST_F(ResourceFetcherTest, VaryOnBack)
ResourceFetcher* fetcher = ResourceFetcher::create(context);
KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
- RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Raw);
+ RawPtr<Resource> resource = Resource::create(url, Resource::Raw);
memoryCache()->add(resource.get());
ResourceResponse response;
response.setURL(url);
@@ -163,7 +163,7 @@ TEST_F(ResourceFetcherTest, VaryOnBack)
ASSERT_TRUE(resource->hasVaryHeader());
FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
+ RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
EXPECT_EQ(resource, newResource);
memoryCache()->remove(newResource.get());
@@ -182,13 +182,13 @@ TEST_F(ResourceFetcherTest, VaryImage)
URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png", WebString::fromUTF8(""), WrappedResourceResponse(response));
FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> resource = fetcher->requestResource(fetchRequestOriginal, TestResourceFactory(Resource::Image));
+ RawPtr<Resource> resource = fetcher->requestResource(fetchRequestOriginal, TestResourceFactory(Resource::Image));
ASSERT_TRUE(resource.get());
Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
ASSERT_TRUE(resource->hasVaryHeader());
FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
+ RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
EXPECT_EQ(resource, newResource);
memoryCache()->remove(newResource.get());
@@ -204,7 +204,7 @@ TEST_F(ResourceFetcherTest, RevalidateWhileLoading)
ResourceRequest request1(url);
request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> resource1 = fetcher1->requestResource(fetchRequest1, TestResourceFactory(Resource::Image));
+ RawPtr<Resource> resource1 = fetcher1->requestResource(fetchRequest1, TestResourceFactory(Resource::Image));
ResourceResponse response;
response.setURL(url);
response.setHTTPStatusCode(200);
@@ -217,7 +217,7 @@ TEST_F(ResourceFetcherTest, RevalidateWhileLoading)
context->setCachePolicy(CachePolicyRevalidate);
ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
FetchRequest fetchRequest2(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
+ RawPtr<Resource> resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
EXPECT_EQ(resource1, resource2);
// Tidily(?) shut down the ResourceLoader.
@@ -232,8 +232,8 @@ TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl)
ResourceLoaderOptions options;
options.dataBufferingPolicy = DoNotBufferData;
FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::internal, options);
- RefPtrWillBeRawPtr<Resource> resource1 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
- RefPtrWillBeRawPtr<Resource> resource2 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
+ RawPtr<Resource> resource1 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
+ RawPtr<Resource> resource2 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
EXPECT_NE(resource1.get(), resource2.get());
memoryCache()->remove(resource2.get());
}
@@ -273,7 +273,7 @@ TEST_F(ResourceFetcherTest, ResponseOnCancel)
ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
- RefPtrWillBeRawPtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
+ RawPtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
ServeRequestsOnCompleteClient client;
resource->addClient(&client);
resource->loader()->cancel();
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698