summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 03:21:58 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 03:21:58 +0000
commit30b890aad430b967b94f936487d46ab03d14800c (patch)
tree7e857e3e472e36bb7d2d29b9c066f91e213adbd2 /chrome/test/ui
parentbc66152178cf68c3df518853b2f68bfa90d71be5 (diff)
downloadchromium_src-30b890aad430b967b94f936487d46ab03d14800c.zip
chromium_src-30b890aad430b967b94f936487d46ab03d14800c.tar.gz
chromium_src-30b890aad430b967b94f936487d46ab03d14800c.tar.bz2
Add the first event ui test + a bunch of refactoring.
TEST=none BUG=none Review URL: http://codereview.chromium.org/271020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/ui_layout_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index 51c54b7..a760fff 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -113,15 +113,15 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
new_layout_test_dir_ = new_layout_test_dir_.Append(test_case_dir);
ASSERT_TRUE(file_util::CreateDirectory(new_layout_test_dir_));
- // Copies the resource subdirectory.
+ // Copy the resource subdirectory if it exists.
FilePath layout_test_resource_path(layout_test_dir_);
layout_test_resource_path =
layout_test_resource_path.AppendASCII("resources");
FilePath new_layout_test_resource_path(new_layout_test_dir_);
new_layout_test_resource_path =
new_layout_test_resource_path.AppendASCII("resources");
- ASSERT_TRUE(file_util::CopyDirectory(
- layout_test_resource_path, new_layout_test_resource_path, true));
+ file_util::CopyDirectory(layout_test_resource_path,
+ new_layout_test_resource_path, true);
// Copies the parent resource subdirectory. This is needed in order to run
// http layout tests.