Fix problems with PPB_URLLoader_Impl and PPAPITests.URLLoader.

ppapi/tests/test_url_loader.cc

 // Copyright (c) 2011 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.
 
 #include "ppapi/tests/test_url_loader.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <string>
 
 #include "ppapi/c/dev/ppb_file_io_dev.h"
 #include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
+#include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/cpp/dev/file_io_dev.h"
 #include "ppapi/cpp/dev/file_ref_dev.h"
 #include "ppapi/cpp/dev/file_system_dev.h"
+#include "ppapi/cpp/dev/url_util_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/url_loader.h"
 #include "ppapi/cpp/url_request_info.h"
 #include "ppapi/cpp/url_response_info.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(URLLoader);
 
@@ skipping 235 matching lines @@
       return "URLLoader::Open() failed to block a cross-origin request.";
     } else {
       return ReportError("URLLoader::Open()", rv);
     }
   }
 
   PASS();
 }
 
 std::string TestURLLoader::TestCrossOriginRequest() {
+  // Get the document URL and use it to construct a URL that will be
+  // considered cross-origin by the WebKit access control code, and yet be
+  // reachable by the test server.
+  PP_URLComponents_Dev components;
+  pp::Var document_url = GetDocumentURL(instance_, &components);
+  std::string cross_origin_url = document_url.AsString();
+  cross_origin_url.replace("127.0.0.1", "localhost");
+
   pp::URLRequestInfo request(instance_);
-  // Create a URL that will be considered to be a different origin.
-  request.SetURL("http://127.0.0.1/test_url_loader_data/hello.txt");
+  request.SetURL(cross_origin_url);
   request.SetAllowCrossOriginRequests(true);
 
   TestCompletionCallback callback(instance_->pp_instance());
 
   pp::URLLoader loader(*instance_);
   int32_t rv = loader.Open(request, callback);
   if (rv == PP_ERROR_WOULDBLOCK)
     rv = callback.WaitForResult();
 
   // We expect success since we allowed a cross-origin request.
-  if (rv == PP_ERROR_NOACCESS)
+  if (rv != PP_OK)
     return ReportError("URLLoader::Open()", rv);
 
   PASS();
 }
 
 // This test should cause a redirect and ensure that the loader runs
 // the callback, rather than following the redirect.
 std::string TestURLLoader::TestAuditURLRedirect() {
   pp::URLRequestInfo request(instance_);
   // This path will cause the server to return a 301 redirect.
@@ skipping 76 matching lines @@
 
   // TODO(viettrungluu): More abort tests (but add basic tests first).
   // Also test that Close() aborts properly. crbug.com/69457
 
   PASS();
 }
 
 // TODO(viettrungluu): Add tests for FollowRedirect,
 // Get{Upload,Download}Progress, Close (including abort tests if applicable).
 // TODO(darin): Add a test for GrantUniversalAccess.