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

Unified Diff: ash/test/test_suite.h

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.h
diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h
index 5f869f39cfa673ea3f3e1438c2ff7319208236ce..0920f65dd060c8854eff3a1bcf14e11591b8c1ff 100644
--- a/ash/test/test_suite.h
+++ b/ash/test/test_suite.h
@@ -7,14 +7,10 @@
#include <memory>
-#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/test/test_discardable_memory_allocator.h"
#include "base/test/test_suite.h"
-#if defined(OS_WIN)
-#include "base/win/scoped_com_initializer.h"
-#endif
-
namespace aura {
class Env;
}
@@ -33,12 +29,11 @@ class AuraShellTestSuite : public base::TestSuite {
void Shutdown() override;
private:
-#if defined(OS_WIN)
- std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
-#endif
std::unique_ptr<aura::Env> env_;
base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
+
+ DISALLOW_COPY_AND_ASSIGN(AuraShellTestSuite);
};
} // namespace test

Powered by Google App Engine
This is Rietveld 408576698