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

Unified Diff: ash/test/ash_test_helper.cc

Issue 1885653003: Attempt to fix ash tests on Chrome OS valgrind (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't revert all of commit abc44825 Created 4 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 | « no previous file | tools/valgrind/gtest_exclude/ash_unittests.gtest-memcheck.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 060f8c1bee54bb80d096b65b204b0b9e5c52ca28..9a76d5bb8192fc19bf0c07ce260173cc4761a846 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -28,6 +28,7 @@
#include "ui/compositor/test/context_factories_for_test.h"
#include "ui/message_center/message_center.h"
#include "ui/wm/core/capture_controller.h"
+#include "ui/wm/core/cursor_manager.h"
#if defined(OS_CHROMEOS)
#include "chromeos/audio/cras_audio_handler.h"
@@ -113,6 +114,10 @@ void AshTestHelper::SetUp(bool start_session) {
}
ShellContentState::SetInstance(content_state);
+ // Reset the global state for the cursor manager. This includes the
+ // last cursor visibility state, etc.
+ wm::CursorManager::ResetCursorVisibilityStateForTest();
+
ShellInitParams init_params;
init_params.delegate = test_shell_delegate_;
init_params.context_factory = context_factory;
« no previous file with comments | « no previous file | tools/valgrind/gtest_exclude/ash_unittests.gtest-memcheck.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698