Added missing layout tests along with associated rebaselinings.

Updated DEPS to include common resource files needed by tests, and add APIs
to ui_layout_test to allow specifying resource files to copy.
Disabled non-working tests so we can enable worker_uitests on Mac/Linux.

BUG=22174
TEST=worker_uitest

Review URL: http://codereview.chromium.org/211051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26919 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 0 deletions

diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index dc0a4a2..9fab8c0 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -142,6 +142,25 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   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());
diff --git a/chrome/test/ui/ui_layout_test.h b/chrome/test/ui/ui_layout_test.h
index 49d6a63..3770478 100644
--- a/chrome/test/ui/ui_layout_test.h
+++ b/chrome/test/ui/ui_layout_test.h
@@ -16,6 +16,8 @@ class UILayoutTest : public UITest {
   void InitializeForLayoutTest(const FilePath& test_parent_dir,
                                const FilePath& test_case_dir,
                                bool is_http_test);
+  void AddResourceForLayoutTest(const FilePath& parent_dir,
+                                const FilePath& resource_dir);
   void RunLayoutTest(const std::string& test_case_file_name,
                      bool is_http_test);