[Ozone-DRI] Do proper bounds checks when moving the cursor

ui/ozone/platform/dri/dri_surface_factory_unittest.cc

Index: ui/ozone/platform/dri/dri_surface_factory_unittest.cc
diff --git a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc b/ui/ozone/platform/dri/dri_surface_factory_unittest.cc
index 4c5195ac9ddc94cc44393e5b994443d30a99ca25..1fbaf313f72b6655fa89cec68cfd41e14366b292 100644
--- a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc
+++ b/ui/ozone/platform/dri/dri_surface_factory_unittest.cc
@@ -14,7 +14,7 @@
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
-#include "ui/ozone/platform/dri/dri_window_manager.h"
+#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
@@ -65,7 +65,7 @@ class DriSurfaceFactoryTest : public testing::Test {
   scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
   scoped_ptr<MockScreenManager> screen_manager_;
   scoped_ptr<ui::DriSurfaceFactory> factory_;
-  scoped_ptr<ui::DriWindowManager> window_manager_;
+  scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactoryTest);
@@ -77,21 +77,21 @@ void DriSurfaceFactoryTest::SetUp() {
   buffer_generator_.reset(new ui::DriBufferGenerator(dri_.get()));
   screen_manager_.reset(new MockScreenManager(dri_.get(),
                                               buffer_generator_.get()));
-  window_manager_.reset(new ui::DriWindowManager());
+  window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
   factory_.reset(new ui::DriSurfaceFactory(
-      dri_.get(), screen_manager_.get(), window_manager_.get()));
+      dri_.get(), screen_manager_.get(), window_delegate_manager_.get()));
 
   scoped_ptr<ui::DriWindowDelegate> window_delegate(
       new ui::DriWindowDelegateImpl(ui::DriSurfaceFactory::kDefaultWidgetHandle,
                                     screen_manager_.get()));
   window_delegate->Initialize();
-  window_manager_->AddWindowDelegate(
+  window_delegate_manager_->AddWindowDelegate(
       ui::DriSurfaceFactory::kDefaultWidgetHandle, window_delegate.Pass());
 }
 
 void DriSurfaceFactoryTest::TearDown() {
   scoped_ptr<ui::DriWindowDelegate> delegate =
-      window_manager_->RemoveWindowDelegate(
+      window_delegate_manager_->RemoveWindowDelegate(
           ui::DriSurfaceFactory::kDefaultWidgetHandle);
   delegate->Shutdown();
   factory_.reset();