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

Unified Diff: chrome/test/interactive_ui/view_event_test_base.cc

Issue 1576008: Enable interactive_ui_tests (Closed)
Patch Set: include Created 10 years, 8 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 | « chrome/test/interactive_ui/interactive_ui_tests.gypi ('k') | chrome/test/ui_test_utils_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/interactive_ui/view_event_test_base.cc
diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc
index e971954ecb5319da6f1cbd7d408ba49ddcd7851c..8936d576b0196d2445af01cfbf8eda45d8d367e5 100644
--- a/chrome/test/interactive_ui/view_event_test_base.cc
+++ b/chrome/test/interactive_ui/view_event_test_base.cc
@@ -12,6 +12,7 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "chrome/browser/automation/ui_controls.h"
+#include "chrome/test/ui_test_utils.h"
#include "views/view.h"
#include "views/window/window.h"
@@ -87,7 +88,9 @@ void ViewEventTestBase::TearDown() {
#if defined(OS_WIN)
DestroyWindow(window_->GetNativeWindow());
#else
- gtk_widget_destroy(GTK_WIDGET(window_->GetNativeWindow()));
+ window_->Close();
+ MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
+ ui_test_utils::RunMessageLoop();
#endif
window_ = NULL;
}
« no previous file with comments | « chrome/test/interactive_ui/interactive_ui_tests.gypi ('k') | chrome/test/ui_test_utils_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698