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

Unified Diff: ash/test/test_suite.cc

Issue 2642113004: chromeos: Remove OS_WIN and OS_CHROMEOS ifdefs from ash/test (Closed)
Patch Set: Created 3 years, 11 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 3fde2c6de7267236bdcf471bc54aa64c96ffaa08..6a0aaf5603bd454218cc320c159ab5067695f617 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -17,11 +17,6 @@
#include "ui/gfx/gfx_paths.h"
#include "ui/gl/test/gl_surface_test_support.h"
-#if defined(OS_WIN)
-#include "base/win/scoped_com_initializer.h"
-#include "ui/base/win/atl_module.h"
-#endif
-
namespace ash {
namespace test {
@@ -34,11 +29,6 @@ void AuraShellTestSuite::Initialize() {
base::TestSuite::Initialize();
gl::GLSurfaceTestSupport::InitializeOneOff();
-#if defined(OS_WIN)
- com_initializer_.reset(new base::win::ScopedCOMInitializer());
- ui::win::CreateATLModuleIfNeeded();
-#endif
-
gfx::RegisterPathProvider();
ui::RegisterPathProvider();
@@ -73,9 +63,6 @@ void AuraShellTestSuite::Initialize() {
void AuraShellTestSuite::Shutdown() {
env_.reset();
ui::ResourceBundle::CleanupSharedInstance();
-#if defined(OS_WIN)
- com_initializer_.reset();
-#endif
base::TestSuite::Shutdown();
}

Powered by Google App Engine
This is Rietveld 408576698