Make dumpResourceLoadCallbacks() show relative paths which match the results ...

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 104 matching lines @@
   if (url.empty() || std::string::npos == url.find("file://"))
     return url;
 
   std::string filename =
       WideToUTF8(file_util::GetFilenameFromPath(UTF8ToWide(url)));
   if (filename.empty())
     return "file:";  // A WebKit test has this in its expected output.
   return filename;
 }
 
+// Used to write a platform neutral file:/// URL by taking the
+// filename and its directory. (e.g., converts
+// "file:///tmp/foo/bar.txt" to just "bar.txt").
+std::string DescriptionSuitableForTestResult(const std::string& url) {
+  if (url.empty() || std::string::npos == url.find("file://"))
+    return url;
+
+  size_t pos = url.rfind('/');
+  if (pos == std::string::npos || pos == 0)
+    return "ERROR:" + url;
+  pos = url.rfind('/', pos - 1);
+  if (pos == std::string::npos)
+    return "ERROR:" + url;
+
+  return url.substr(pos + 1);
+}
+
 // Adds a file called "DRTFakeFile" to |data_object| (CF_HDROP).  Use to fake
 // dragging a file.
 void AddDRTFakeFileToDataObject(WebDragData* drag_data) {
   drag_data->appendToFileNames(WebString::fromUTF8("DRTFakeFile"));
 }
 
 // Get a debugging string from a WebNavigationType.
 const char* WebNavigationTypeToString(WebNavigationType type) {
   switch (type) {
     case WebKit::WebNavigationTypeLinkClicked:
@@ skipping 16 matching lines @@
   if (url.SchemeIs("file"))
     return url.ExtractFileName();
 
   return url.possibly_invalid_spec();
 }
 
 std::string GetResponseDescription(const WebURLResponse& response) {
   if (response.isNull())
     return "(null)";
 
+  const std::string url = GURL(response.url()).possibly_invalid_spec();
   return StringPrintf("<NSURLResponse %s, http status code %d>",
-      GURL(response.url()).possibly_invalid_spec().c_str(),
-      response.httpStatusCode());
+                      DescriptionSuitableForTestResult(url).c_str(),
+                      response.httpStatusCode());
 }
 
 std::string GetErrorDescription(const WebURLError& error) {
   std::string domain = UTF16ToASCII(error.domain);
   int code = error.reason;
 
   if (domain == net::kErrorDomain) {
     domain = "NSURLErrorDomain";
     switch (error.reason) {
       case net::ERR_ABORTED:
@@ skipping 620 matching lines @@
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didChangeLocationWithinPageForFrame\n",
            GetFrameDescription(frame).c_str());
   }
 
   UpdateForCommittedLoad(frame, is_new_navigation);
 }
 
 void TestWebViewDelegate::assignIdentifierToRequest(
     WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
-  if (shell_->ShouldDumpResourceLoadCallbacks())
-    resource_identifier_map_[identifier] = request.url().spec();
+  if (shell_->ShouldDumpResourceLoadCallbacks()) {
+    resource_identifier_map_[identifier] =
+        DescriptionSuitableForTestResult(request.url().spec());
+  }
 }
 
 void TestWebViewDelegate::willSendRequest(
     WebFrame* frame, unsigned identifier, WebURLRequest& request,
     const WebURLResponse& redirect_response) {
   GURL url = request.url();
   std::string request_url = url.possibly_invalid_spec();
 
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     GURL main_document_url = request.firstPartyForCookies();
     printf("%s - willSendRequest <NSURLRequest URL %s, main document URL %s,"
            " http method %s> redirectResponse %s\n",
            GetResourceDescription(identifier).c_str(),
-           request_url.c_str(),
+           DescriptionSuitableForTestResult(request_url).c_str(),
            GetURLDescription(main_document_url).c_str(),
            request.httpMethod().utf8().data(),
            GetResponseDescription(redirect_response).c_str());
   }
 
   if (!redirect_response.isNull() && block_redirects_) {
     printf("Returning null for this redirect\n");
 
     // To block the request, we set its URL to an empty one.
     request.setURL(WebURL());
@@ skipping 252 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }