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

Unified Diff: ash/test/ash_test_helper.cc

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 | ash/test/test_suite.cc » ('j') | ui/base/resource/data_pack.cc » ('J')
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..9995811054ed4d381b0bdd629f65d262f4d9c02e 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -126,7 +126,6 @@ void AshTestHelper::TearDown() {
chromeos::DBusThreadManager::Shutdown();
dbus_thread_manager_initialized_ = false;
}
- keyboard::ResetKeyboardForTesting();
Nico 2015/05/02 00:50:48 ?
sadrul 2015/05/02 04:17:09 A new instance of ash::Shell gets created for each
Nico 2015/05/06 01:06:35 I would've guessed that the intention of this is t
#endif
aura::Env::DeleteInstance();
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | ui/base/resource/data_pack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698