Run the Worker tests for resolveLocalFileSystemURL that were added

chrome/test/ui/ui_layout_test.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 "chrome/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
@@ skipping 108 matching lines @@
   // Copies the parent resource subdirectory. This is needed in order to run
   // http layout tests.
   if (port == kHttpPort) {
     FilePath parent_resource_path(layout_test_dir_.DirName());
     parent_resource_path = parent_resource_path.AppendASCII("resources");
     FilePath new_parent_resource_path(new_layout_test_dir_.DirName());
     new_parent_resource_path =
         new_parent_resource_path.AppendASCII("resources");
     ASSERT_TRUE(file_util::CopyDirectory(
         parent_resource_path, new_parent_resource_path, true));
+
+    // Copy the js test files to the same location they're copied to
+    // when running under DRT.
+    FilePath js_resources_dir = src_dir.AppendASCII("fast")
+                                       .AppendASCII("js")
+                                       .AppendASCII("resources");
+    FilePath new_js_resources_dir =
+        new_layout_test_dir_.AppendASCII("js-test-resources");

[michaeln, 2011/03/22 21:32:50]

Geez... so the fast/js/resources are also used for http tests? How are the files
picked up from this directory by the executing tests?

[adamk, 2011/03/22 21:41:00]

<script src="/js-test-resources/js-test-pre.js">.  This is the same way it's
done when these tests are run under NRWT.

+    ASSERT_TRUE(file_util::CopyDirectory(js_resources_dir,
+                                         new_js_resources_dir,
+                                         true));
   }
 
   // Reads the layout test controller simulation script.
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("layout_tests");
   path = path.AppendASCII("layout_test_controller.html");
   ASSERT_TRUE(file_util::ReadFileToString(path, &layout_test_controller_));
 }
 
@@ skipping 66 matching lines @@
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
   // We expect the test case dir to be ASCII.  It might be empty, so we
   // can't test whether MaybeAsASCII succeeded, but the tests will fail
   // loudly in that case anyway.
   std::string url_path = test_case_dir_.MaybeAsASCII();
 
   scoped_ptr<GURL> new_test_url;
   if (port != kNoHttpPort)
     new_test_url.reset(new GURL(
-        StringPrintf("http://localhost:%d/", port) +
+        StringPrintf("http://127.0.0.1:%d/", port) +

[michaeln, 2011/03/22 21:32:50]

+1 on this change

[adamk, 2011/03/22 21:41:00]

Yeah, this is something that brings us in line with NRWT.  I was happy to see it
didn't break anything else.

         url_path + "/" + test_case_file_name));
   else
     new_test_url.reset(new GURL(net::FilePathToFileURL(new_test_file_path)));
 
   // Runs the new layout test.
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(*new_test_url.get()));
   std::string escaped_value =
       WaitUntilCookieNonEmpty(tab.get(), *new_test_url.get(),
@@ skipping 40 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }