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

Unified Diff: ash/test/ash_test_base.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
« no previous file with comments | « no previous file | ash/test/ash_test_base.cc » ('j') | ash/test/ash_test_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index d376a94856dc8a422fb25bdc84a1711a284259d0..9d7bca1c0ce1dbd63f6d935fa7681d2065a5ed09 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -11,7 +11,6 @@
#include <string>
#include "ash/common/material_design/material_design_controller.h"
-#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/thread.h"
@@ -20,10 +19,6 @@
#include "ui/display/display.h"
#include "ui/wm/public/window_types.h"
-#if defined(OS_WIN)
-#include "ui/base/win/scoped_ole_initializer.h"
-#endif
-
namespace aura {
class Window;
class WindowDelegate;
@@ -195,9 +190,6 @@ class AshTestBase : public testing::Test {
std::unique_ptr<AshTestEnvironment> ash_test_environment_;
std::unique_ptr<AshTestHelper> ash_test_helper_;
std::unique_ptr<ui::test::EventGenerator> event_generator_;
-#if defined(OS_WIN)
- ui::ScopedOleInitializer ole_initializer_;
-#endif
DISALLOW_COPY_AND_ASSIGN(AshTestBase);
};
« no previous file with comments | « no previous file | ash/test/ash_test_base.cc » ('j') | ash/test/ash_test_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698