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

Unified Diff: ash/test/test_suite.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
Index: ash/test/test_suite.cc
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index 4f1ead03e2d41ffd50cc3b34a9a4fb31a030c574..94cdea113f097a0019acce3c5fd06575658832a0 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -14,6 +14,10 @@
#include "ui/gfx/gfx_paths.h"
#include "ui/gl/gl_surface.h"
+#if defined(OS_CHROMEOS)
+#include "ui/keyboard/keyboard.h"
+#endif
+
#if defined(OS_WIN)
#include "base/win/windows_version.h"
#include "ui/base/win/atl_module.h"
@@ -57,6 +61,9 @@ void AuraShellTestSuite::Initialize() {
}
void AuraShellTestSuite::Shutdown() {
+#if defined(OS_CHROMEOS)
+ keyboard::ResetKeyboardForTesting();
+#endif
ui::ResourceBundle::CleanupSharedInstance();
#if defined(OS_WIN)
com_initializer_.reset();

Powered by Google App Engine
This is Rietveld 408576698