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

Unified Diff: ui/ozone/platform/test/ozone_platform_test.cc

Issue 802813002: ozone: Move InputControllerTest to a common place (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scoper & remove useless unused annotations Created 6 years 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 | « ui/ozone/platform/test/input_controller_test.cc ('k') | ui/ozone/platform/test/test.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/test/ozone_platform_test.cc
diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index 9a5d37349c2b4e3a41f3f79e16e1826490926728..7482f96662e983988786a0ee217d2af2feec2bee 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -9,12 +9,12 @@
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
-#include "ui/ozone/platform/test/input_controller_test.h"
#include "ui/ozone/platform/test/test_window.h"
#include "ui/ozone/platform/test/test_window_manager.h"
#include "ui/ozone/public/cursor_factory_ozone.h"
#include "ui/ozone/public/gpu_platform_support.h"
#include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_switches.h"
#include "ui/ozone/public/system_input_injector.h"
@@ -67,7 +67,7 @@ class OzonePlatformTest : public OzonePlatform {
if (!PlatformEventSource::GetInstance())
platform_event_source_ = PlatformEventSource::CreateDefault();
- input_controller_.reset(new InputControllerTest);
+ input_controller_ = CreateStubInputController();
cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
}
@@ -80,7 +80,7 @@ class OzonePlatformTest : public OzonePlatform {
scoped_ptr<TestWindowManager> window_manager_;
scoped_ptr<PlatformEventSource> platform_event_source_;
scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
- scoped_ptr<InputControllerTest> input_controller_;
+ scoped_ptr<InputController> input_controller_;
scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
base::FilePath file_path_;
« no previous file with comments | « ui/ozone/platform/test/input_controller_test.cc ('k') | ui/ozone/platform/test/test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698