Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/test/ui/npapi_test_helper.cc

Issue 3052041: Better fix for Windows test failure. Delete the old file (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/npapi_test_helper.cc
diff --git a/chrome/test/ui/npapi_test_helper.cc b/chrome/test/ui/npapi_test_helper.cc
index f8cc827c59af13e7054abb11a94672f43687af58..d5a21438eb0521780900c10b7518373e3de6f40c 100644
--- a/chrome/test/ui/npapi_test_helper.cc
+++ b/chrome/test/ui/npapi_test_helper.cc
@@ -45,11 +45,13 @@ void NPAPITesterBase::SetUp() {
test_plugin_path_ = plugins_directory.AppendASCII(test_plugin_name_);
file_util::CreateDirectory(plugins_directory);
- if (!file_util::PathExists(test_plugin_path_)) {
- ASSERT_TRUE(file_util::CopyDirectory(plugin_src, test_plugin_path_, true))
- << "Copy failed from " << plugin_src.value()
- << " to " << test_plugin_path_.value();
- }
+#if defined(OS_WIN)
+ file_util::DieFileDie(test_plugin_path_, false);
+#endif
+ ASSERT_TRUE(file_util::CopyDirectory(plugin_src, test_plugin_path_, true))
+ << "Copy failed from " << plugin_src.value()
+ << " to " << test_plugin_path_.value();
+
#if defined(OS_MACOSX)
// The plugins directory isn't read by default on the Mac, so it needs to be
// explicitly registered.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698