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

Unified Diff: ash/test/ash_test_helper.cc

Issue 1130753004: virtual keyboard: It is not longer necessary to 'reset' for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 | ui/keyboard/keyboard.h » ('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 6cab8fd59455d9de7e7ecf65afea1db0d8feecd3..60b8f3ed9fa1630aa2986c7d3b709dfdf5d11af9 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -29,7 +29,6 @@
#if defined(OS_CHROMEOS)
#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "ui/keyboard/keyboard.h"
#endif
#if defined(OS_WIN)
@@ -126,7 +125,6 @@ void AshTestHelper::TearDown() {
chromeos::DBusThreadManager::Shutdown();
dbus_thread_manager_initialized_ = false;
}
- keyboard::ResetKeyboardForTesting();
#endif
aura::Env::DeleteInstance();
« no previous file with comments | « no previous file | ui/keyboard/keyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698