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

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, 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 168 matching lines @@
     {
         KURL inputURL(ParsedURLString, input);
         KURL expectedURL(ParsedURLString, expected);
 
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchRequest.mutableResourceRequest().setRequestContext(requestContext);
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
         fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
 
-        EXPECT_STREQ(expectedURL.getString().utf8().data(), fetchRequest.resourceRequest().url().getString().utf8().data());
+        EXPECT_EQ(expectedURL.getString(), fetchRequest.resourceRequest().url().getString());
         EXPECT_EQ(expectedURL.protocol(), fetchRequest.resourceRequest().url().protocol());
         EXPECT_EQ(expectedURL.host(), fetchRequest.resourceRequest().url().host());
         EXPECT_EQ(expectedURL.port(), fetchRequest.resourceRequest().url().port());
         EXPECT_EQ(expectedURL.hasPort(), fetchRequest.resourceRequest().url().hasPort());
         EXPECT_EQ(expectedURL.path(), fetchRequest.resourceRequest().url().path());
     }
 
     void expectHTTPSHeader(const char* input, WebURLRequest::FrameType frameType, bool shouldPrefer)
     {
         KURL inputURL(ParsedURLString, input);
 
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextScript);
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
         fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
 
-        EXPECT_STREQ(shouldPrefer ? "1" : "",
-            fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());
+        EXPECT_EQ(shouldPrefer ? String("1") : String(),
+            fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests));
 
         // Calling upgradeInsecureRequest more than once shouldn't affect the header.
         if (shouldPrefer) {
             fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
-            EXPECT_STREQ("1", fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());
+            EXPECT_EQ("1", fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests));
         }
     }
 
     RefPtr<SecurityOrigin> exampleOrigin;
     RefPtr<SecurityOrigin> secureOrigin;
 };
 
 TEST_F(FrameFetchContextUpgradeTest, UpgradeInsecureResourceRequests)
 {
     struct TestCase {
@@ skipping 106 matching lines @@
         KURL inputURL(ParsedURLString, input);
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         if (width > 0) {
             FetchRequest::ResourceWidth resourceWidth;
             resourceWidth.width = width;
             resourceWidth.isSet = true;
             fetchRequest.setResourceWidth(resourceWidth);
         }
         fetchContext->addClientHintsIfNecessary(fetchRequest);
 
-        EXPECT_STREQ(isPresent ? headerValue : "",
-            fetchRequest.resourceRequest().httpHeaderField(headerName).utf8().data());
+        EXPECT_EQ(isPresent ? String(headerValue) : String(),
+            fetchRequest.resourceRequest().httpHeaderField(headerName));
     }
 };
 
 TEST_F(FrameFetchContextHintsTest, MonitorDPRHints)
 {
     expectHeader("http://www.example.com/1.gif", "DPR", false, "");
     ClientHintsPreferences preferences;
     preferences.setShouldSendDPR(true);
     document->clientHintsPreferences().updateFrom(preferences);
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
@@ skipping 133 matching lines @@
         ResourceRequest request("http://example.test/");
         request.setFrameType(test.frameType);
         if (strlen(test.requestorOrigin) == 0)
             request.setRequestorOrigin(nullptr);
         else
             request.setRequestorOrigin(SecurityOrigin::create(KURL(ParsedURLString, test.requestorOrigin)));
 
         // Compare the populated |requestorOrigin| against |test.serializedOrigin|
         fetchContext->populateRequestData(request);
         if (strlen(test.serializedOrigin) == 0)
-            EXPECT_EQ(nullptr, request.requestorOrigin().get());
+            EXPECT_FALSE(request.requestorOrigin().get());
         else
             EXPECT_EQ(String(test.serializedOrigin), request.requestorOrigin()->toString());
 
         EXPECT_EQ(document->firstPartyForCookies(), request.firstPartyForCookies());
     }
 }
 
 TEST_F(FrameFetchContextTest, ModifyPriorityForLowPriorityIframes)
 {
     Settings* settings = document->frame()->settings();
@@ skipping 10 matching lines @@
     EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh));
     EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium));
 }
 
 TEST_F(FrameFetchContextTest, EnableDataSaver)
 {
     Settings* settings = document->frame()->settings();
     settings->setDataSaverEnabled(true);
     ResourceRequest resourceRequest("http://www.example.com");
     fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
-    EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
+    EXPECT_EQ("on", resourceRequest.httpHeaderField("Save-Data"));
 
     // Subsequent call to addAdditionalRequestHeaders should not append to the
     // save-data header.
     fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
-    EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
+    EXPECT_EQ("on", resourceRequest.httpHeaderField("Save-Data"));
 }
 
 TEST_F(FrameFetchContextTest, DisabledDataSaver)
 {
     ResourceRequest resourceRequest("http://www.example.com");
     fetchContext->addAdditionalRequestHeaders(resourceRequest, FetchMainResource);
-    EXPECT_STREQ("", resourceRequest.httpHeaderField("Save-Data").utf8().data());
+    EXPECT_EQ(String(), resourceRequest.httpHeaderField("Save-Data"));
 }
 
 // Tests that when a resource with certificate errors is loaded from the
 // memory cache, the embedder is notified.
 TEST_F(FrameFetchContextDisplayedCertificateErrorsTest, MemoryCacheCertificateError)
 {
     ResourceRequest resourceRequest(url);
     ResourceResponse response;
     response.setURL(url);
     response.setHasMajorCertificateErrors(true);
@@ skipping 34 matching lines @@
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_FALSE(subRequest.isExternalRequest());
     }
 
     RuntimeEnabledFeatures::setCorsRFC1918Enabled(true);
     for (const auto& test : cases) {
         SCOPED_TRACE(test.url);
         ResourceRequest mainRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
-        EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
-        EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
     }
 }
 
 TEST_F(FrameFetchContextTest, SetIsExternalRequestForPrivateDocument)
 {
     document->setAddressSpace(WebAddressSpacePrivate);
     EXPECT_EQ(WebAddressSpacePrivate, document->addressSpace());
 
     struct TestCase {
         const char* url;
@@ skipping 23 matching lines @@
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_FALSE(subRequest.isExternalRequest());
     }
 
     RuntimeEnabledFeatures::setCorsRFC1918Enabled(true);
     for (const auto& test : cases) {
         SCOPED_TRACE(test.url);
         ResourceRequest mainRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
-        EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
-        EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
     }
 }
 
 TEST_F(FrameFetchContextTest, SetIsExternalRequestForLocalDocument)
 {
     document->setAddressSpace(WebAddressSpaceLocal);
     EXPECT_EQ(WebAddressSpaceLocal, document->addressSpace());
 
     struct TestCase {
         const char* url;
@@ skipping 22 matching lines @@
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_FALSE(subRequest.isExternalRequest());
     }
 
     RuntimeEnabledFeatures::setCorsRFC1918Enabled(true);
     for (const auto& test : cases) {
         ResourceRequest mainRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
-        EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
-        EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
+        EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
     }
 }
 
 } // namespace blink