[XHR] Tidy up files for testing XHR's error for mixed content check failure

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

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * 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.
@@ skipping 820 matching lines @@
         if (request.requestContext() == WebURLRequest::RequestContextVideo || request.requestContext() == WebURLRequest::RequestContextAudio)
             setResource(RawResource::fetchMedia(newRequest, document().fetcher()));
         else if (request.requestContext() == WebURLRequest::RequestContextManifest)
             setResource(RawResource::fetchManifest(newRequest, document().fetcher()));
         else
             setResource(RawResource::fetch(newRequest, document().fetcher()));
 
         if (!resource()) {
             ThreadableLoaderClient* client = m_client;
             clear();
-            client->didFail(ResourceError(errorDomainBlinkInternal, 0, requestURL.string(), "Failed to start loading."));
+            client->didFail(ResourceError(errorDomainBlinkInternal, 0, requestURL.string(), "Failed to start a loader"));

[hiroshige, 2016/02/22 15:45:46]

This CL doesn't contain -expected.txt diffs. Does it mean that there is no
layout tests that cover this statement and we should add one? (Most of the XHR
tests is written by js-test.js and has -expected.txt)

nit: What is the reason for this message change? I'm not sure what "a loader"
means for JavaScript developers.

[tyoshino (SeeGerritForStatus), 2016/02/25 08:11:24]

I was misunderstanding that a test can be without -expected.txt only when
there's no CONSOLE message. But it's not. Sorry. We really need a -expected.txt
file for this test to verify the printed message.
Good point. I updated this for clarifying internal cause, but this is used for
printing a console message. I wasn't aware of that when making this change.

I think providing additional and internal details in a console message is not
bad (useful when included in a user bug report). Let's refine
RawResource::fetchMedia(), etc. in a separate CL to allow
DocumentThreadbleLoader to get detailed error info from ResourceFetcher and
translate that to a user friendly message.

Reverted.

             // |this| may be dead here.
             return;
         }
 
         if (resource()->loader()) {
             unsigned long identifier = resource()->identifier();
             InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(m_document, identifier, m_client);
         }
+
         return;
     }
 
     FetchRequest fetchRequest(request, m_options.initiator, resourceLoaderOptions);
     if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests)
         fetchRequest.setOriginRestriction(FetchRequest::NoOriginRestriction);
     RefPtrWillBeRawPtr<Resource> resource = RawResource::fetchSynchronously(fetchRequest, document().fetcher());
     ResourceResponse response = resource ? resource->response() : ResourceResponse();
     unsigned long identifier = resource ? resource->identifier() : std::numeric_limits<unsigned long>::max();
     ResourceError error = resource ? resource->resourceError() : ResourceError();
@@ skipping 69 matching lines @@
     return m_securityOrigin ? m_securityOrigin.get() : document().securityOrigin();
 }
 
 Document& DocumentThreadableLoader::document() const
 {
     ASSERT(m_document);
     return *m_document;
 }
 
 } // namespace blink