Resubmitting fix for 22174

chrome/test/ui/ui_layout_test.cc

 // Copyright (c) 2009 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 "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 124 matching lines @@
   }
 
   // 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_));
 }
 
+void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
+                                            const FilePath& resource_dir) {
+  FilePath root_dir;
+  PathService::Get(base::DIR_SOURCE_ROOT, &root_dir);
+
+  FilePath src_dir = root_dir.AppendASCII("chrome");
+  src_dir = src_dir.AppendASCII("test");
+  src_dir = src_dir.AppendASCII("data");
+  src_dir = src_dir.AppendASCII("layout_tests");
+  src_dir = src_dir.Append(parent_dir);
+  src_dir = src_dir.Append(resource_dir);
+  ASSERT_TRUE(file_util::DirectoryExists(src_dir));
+
+  FilePath dest_parent_dir = temp_test_dir_.Append(parent_dir);
+  ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
+  FilePath dest_dir = dest_parent_dir.Append(resource_dir);
+  ASSERT_TRUE(file_util::CopyDirectory(src_dir, dest_dir, true));
+}
+
 void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
                                  bool is_http_test) {
   SCOPED_TRACE(test_case_file_name.c_str());
 
   ASSERT_TRUE(!layout_test_controller_.empty());
 
   // Creates a new cookie name. We will have to use a new cookie because
   // this function could be called multiple times.
   std::string status_cookie(kTestCompleteCookie);
   status_cookie += IntToString(test_count_);
@@ skipping 70 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);
 }