Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse)
 {
     ResourceRequest jpegRequest;
     jpegRequest.setHTTPAccept("image/jpeg");
 
     RawResource* jpegResource(RawResource::create(jpegRequest, Resource::Raw));
 
     ResourceRequest pngRequest;
     pngRequest.setHTTPAccept("image/png");
 
-    ASSERT_FALSE(jpegResource->canReuse(pngRequest));
+    EXPECT_FALSE(jpegResource->canReuse(pngRequest));
 }
 
 class DummyClient final : public GarbageCollectedFinalized<DummyClient>, public RawResourceClient {
     USING_GARBAGE_COLLECTED_MIXIN(DummyClient);
 public:
     DummyClient() : m_called(false), m_numberOfRedirectsReceived(0) {}
     ~DummyClient() override {}
 
     // ResourceClient implementation.
     void notifyFinished(Resource* resource) override
@@ skipping 81 matching lines @@
 
     Persistent<DummyClient> client = new DummyClient;
     resource->addClient(client);
 
     ResourceResponse revalidatingResponse;
     revalidatingResponse.setHTTPStatusCode(304);
     resource->responseReceived(revalidatingResponse, nullptr);
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ(200, resource->response().httpStatusCode());
     EXPECT_EQ(4u, resource->resourceBuffer()->size());
-    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource);
+    EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")));
     memoryCache()->remove(resource);
 
     resource->removeClient(client);
     EXPECT_FALSE(resource->isAlive());
     EXPECT_FALSE(client->called());
     EXPECT_EQ("abcd", String(client->data().data(), client->data().size()));
 }
 
 TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody)
 {
     Resource* resource = RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
     ResourceResponse response;
     response.setHTTPStatusCode(200);
     resource->responseReceived(response, nullptr);
     resource->finish();
     memoryCache()->add(resource);
 
     // Simulate a successful revalidation.
     resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
 
     Persistent<DummyClient> client = new DummyClient;
     resource->addClient(client);
 
     ResourceResponse revalidatingResponse;
     revalidatingResponse.setHTTPStatusCode(304);
     resource->responseReceived(revalidatingResponse, nullptr);
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ(200, resource->response().httpStatusCode());
-    EXPECT_EQ(nullptr, resource->resourceBuffer());
-    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource);
+    EXPECT_FALSE(resource->resourceBuffer());
+    EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")));
     memoryCache()->remove(resource);
 
     resource->removeClient(client);
     EXPECT_FALSE(resource->isAlive());
     EXPECT_FALSE(client->called());
     EXPECT_EQ(0u, client->data().size());
 }
 
 TEST(RawResourceTest, RevalidationSucceededUpdateHeaders)
 {
@@ skipping 101 matching lines @@
     resource->responseReceived(revalidatingResponse, nullptr);
     const char data2[4] = "xyz";
     resource->appendData(data2, 3);
     resource->finish();
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ("https://example.com/1", resource->resourceRequest().url().getString());
     EXPECT_EQ("https://example.com/2", resource->lastResourceRequest().url().getString());
     EXPECT_FALSE(resource->isCacheValidator());
     EXPECT_EQ(200, resource->response().httpStatusCode());
     EXPECT_EQ(3u, resource->resourceBuffer()->size());
-    EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")), resource);
+    EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")));
 
     EXPECT_TRUE(client->called());
     EXPECT_EQ(1, client->numberOfRedirectsReceived());
     EXPECT_EQ("xyz", String(client->data().data(), client->data().size()));
 
     // Test the case where a client is added after revalidation is completed.
     Persistent<DummyClient> client2 = new DummyClient;
     resource->addClient(client2);
 
     // Because RawResourceClient is added asynchronously,
@@ skipping 78 matching lines @@
 
 TEST(RawResourceTest, CanReuseDevToolsEmulateNetworkConditionsClientIdHeader)
 {
     ResourceRequest request("data:text/html,");
     request.setHTTPHeaderField(HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo");
     Resource* raw = RawResource::create(request, Resource::Raw);
     EXPECT_TRUE(raw->canReuse(ResourceRequest("data:text/html,")));
 }
 
 } // namespace blink