Move the mock headers file for 'test_case.html' to the destination directory so cross-origin

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>
 
@@ skipping 98 matching lines @@
   // FileIO interface is not yet supported by ppapi/proxy.
   if (!testing_interface_->IsOutOfProcess()) {
     RUN_TEST_FORCEASYNC_AND_NOT(BasicFilePOST, filter);
     RUN_TEST_FORCEASYNC_AND_NOT(BasicFileRangePOST, filter);
   }
   RUN_TEST_FORCEASYNC_AND_NOT(CompoundBodyPOST, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(EmptyDataPOST, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(BinaryDataPOST, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(CustomRequestHeader, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(FailsBogusContentLength, filter);
-  // Disable portion of test which fails when the HTTP server's
-  // data_dir is moved to PRODUCT_DIR.
-  // http://code.google.com/p/chromium/issues/detail?id=103690
-  //  RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction, filter);
-  //  RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
+  // TODO(bbudge) Enable these tests for NaCl when we have a way to get
+  // the document URL. The PPAPI tests use PPB_URLUtil_Dev.
+#if !(defined __native_client__)
+  RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction, filter);
+  // Cross origin requests require the 'test_case.html.mock-http-headers'
+  // file to be in the same directory as 'test_case.html', so that the test
+  // server returns CORS response headers.
+  RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
+#endif
   RUN_TEST_FORCEASYNC_AND_NOT(JavascriptURLRestriction, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(MethodRestriction, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(HeaderRestriction, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(CustomReferrer, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(CustomContentTransferEncoding, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(StreamToFile, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(AuditURLRedirect, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(AbortCalls, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(UntendedLoad, filter);
 }
@@ skipping 125 matching lines @@
 }
 
 std::string TestURLLoader::GetReachableCrossOriginURL() {
   // 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 pp_document_url = pp::URLUtil_Dev::Get()->GetDocumentURL(
       *instance_, &components);
   std::string document_url = pp_document_url.AsString();
-  // Replace "127.0.0.1" with "localhost".
-  ASSERT_TRUE(document_url.find("127.0.0.1") != std::string::npos);
-  return document_url.replace(
-      components.host.begin, components.host.len, "localhost");
+  // Replace "127.0.0.1" with "localhost". Or vice versa.
+  bool changedHost = false;
+  if (document_url.find("127.0.0.1") != std::string::npos) {
+    document_url.replace(components.host.begin,
+                         components.host.len,
+                         "localhost");
+    changedHost = true;
+  } else if (document_url.find("localhost") != std::string::npos) {
+    document_url.replace(components.host.begin,
+                         components.host.len,
+                         "127.0.0.1");
+    changedHost = true;
+  }
+  ASSERT_TRUE(changedHost);
+  return document_url;
 }
 
 int32_t TestURLLoader::OpenUntrusted(const std::string& method,
                                      const std::string& header) {
   pp::URLRequestInfo request(instance_);
   request.SetURL("/echo");
   request.SetMethod(method);
   request.SetHeaders(header);
 
   return OpenUntrusted(request);
@@ skipping 242 matching lines @@
   pp::URLRequestInfo request(instance_);
   std::string cross_origin_url = GetReachableCrossOriginURL();
   request.SetURL(cross_origin_url);
   request.SetAllowCrossOriginRequests(true);
 
   int32_t rv;
   rv = OpenUntrusted(request);
   if (rv != PP_OK)
     return ReportError(
         "Untrusted, intended cross-origin request", rv);
+#if !(defined __native_client__)
   rv = OpenTrusted(request);
   if (rv != PP_OK)
     return ReportError("Trusted cross-origin request", rv);
+#endif
 
   PASS();
 }
 
 // Javascript URLs are only reachable by trusted loaders.
 std::string TestURLLoader::TestJavascriptURLRestriction() {
   pp::URLRequestInfo request(instance_);
   request.SetURL("javascript:foo = bar");
 
   int32_t rv;
@@ skipping 256 matching lines @@
   if (!error.empty())
     return error;
   if (body != "hello\n")
     return ReportError("Couldn't read data", rv);
 
   PASS();
 }
 
 // TODO(viettrungluu): Add tests for FollowRedirect,
 // Get{Upload,Download}Progress, Close (including abort tests if applicable).