Index: services/ui/ws/test_utils.cc |
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc |
index 8a8b972bc936620266451cff6692f9b76feba4bf..db0daa6d69889be788e6c30eb40cb682802e59da 100644 |
--- a/services/ui/ws/test_utils.cc |
+++ b/services/ui/ws/test_utils.cc |
@@ -42,8 +42,6 @@ class TestPlatformDisplay : public PlatformDisplay { |
// PlatformDisplay: |
void Init(PlatformDisplayDelegate* delegate) override {} |
int64_t GetId() const override { return id_; } |
- void SchedulePaint(const ServerWindow* window, |
- const gfx::Rect& bounds) override {} |
void SetViewportSize(const gfx::Size& size) override {} |
void SetTitle(const base::string16& title) override {} |
void SetCapture() override {} |
@@ -53,7 +51,6 @@ class TestPlatformDisplay : public PlatformDisplay { |
} |
void UpdateTextInputState(const ui::TextInputState& state) override {} |
void SetImeVisibility(bool visible) override {} |
- bool IsFramePending() const override { return false; } |
gfx::Rect GetBounds() const override { return display_metrics_.bounds; } |
bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override { |
if (display_metrics_ == metrics) |
@@ -128,25 +125,14 @@ PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay() { |
// TestFrameGeneratorDelegate ------------------------------------------------- |
-TestFrameGeneratorDelegate::TestFrameGeneratorDelegate( |
- std::unique_ptr<ServerWindow> root) |
- : root_(std::move(root)) {} |
+TestFrameGeneratorDelegate::TestFrameGeneratorDelegate() {} |
TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {} |
-ServerWindow* TestFrameGeneratorDelegate::GetRootWindow() { |
- return root_.get(); |
-} |
- |
bool TestFrameGeneratorDelegate::IsInHighContrastMode() { |
return false; |
} |
-const display::ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics() |
- const { |
- return metrics_; |
-} |
- |
// WindowTreeTestApi --------------------------------------------------------- |
WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {} |