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

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

Issue 3066033: Don't delete npapi plugins copied into <(PRODUCT_DIR)/plugins (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: comment cleanup 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 2bf6f1043f4dee0358805520666159e6430c09c5..142539c461f5bfe1fbfd0e7c6b488155ad1e328c 100644
--- a/chrome/test/ui/npapi_test_helper.cc
+++ b/chrome/test/ui/npapi_test_helper.cc
@@ -37,6 +37,8 @@ NPAPITesterBase::NPAPITesterBase(const std::string& test_plugin_name)
void NPAPITesterBase::SetUp() {
// We need to copy our test-plugin into the plugins directory so that
// the browser can load it.
+ // TODO(tc): We should copy the plugins as a build step, not during
+ // the tests. Then we don't have to clean up after the copy in the test.
FilePath plugins_directory = GetPluginsDirectory();
FilePath plugin_src = browser_directory_.AppendASCII(test_plugin_name_);
ASSERT_TRUE(file_util::PathExists(plugin_src));
@@ -60,7 +62,6 @@ void NPAPITesterBase::TearDown() {
// Tear down the UI test first so that the browser stops using the plugin
// files.
UITest::TearDown();
- EXPECT_TRUE(file_util::DieFileDie(test_plugin_path_, true));
}
FilePath NPAPITesterBase::GetPluginsDirectory() {
@@ -91,9 +92,6 @@ void NPAPITester::TearDown() {
// Tear down the base class first so that the browser stops using the plugin
// files.
NPAPITesterBase::TearDown();
-#if defined(OS_MACOSX)
- EXPECT_TRUE(file_util::DieFileDie(layout_plugin_path_, true));
-#endif // OS_MACOSX
}
// NPAPIVisiblePluginTester members.
« 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