Creating default implementation for aura::client::ScreenPositionClient

ui/views/corewm/tooltip_controller_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/default_activation_client.h"
+#include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/core/wm_state.h"
 #include "ui/wm/public/tooltip_client.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
@@ skipping 364 matching lines @@
 // Returns the index of |window| in its parent's children.
 int IndexInParent(const aura::Window* window) {
   aura::Window::Windows::const_iterator i =
       std::find(window->parent()->children().begin(),
                 window->parent()->children().end(),
                 window);
   return i == window->parent()->children().end() ? -1 :
       static_cast<int>(i - window->parent()->children().begin());
 }
 
-class TestScreenPositionClient : public aura::client::ScreenPositionClient {
- public:
-  TestScreenPositionClient() {}
-  ~TestScreenPositionClient() override {}
-
-  // ScreenPositionClient overrides:
-  void ConvertPointToScreen(const aura::Window* window,
-                            gfx::Point* point) override {}
-  void ConvertPointFromScreen(const aura::Window* window,
-                              gfx::Point* point) override {}
-  void ConvertHostPointToScreen(aura::Window* root_gwindow,
-                                gfx::Point* point) override {
-    NOTREACHED();
-  }
-  void SetBounds(aura::Window* window,
-                 const gfx::Rect& bounds,
-                 const gfx::Display& display) override {
-    window->SetBounds(bounds);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestScreenPositionClient);
-};
-
 }  // namespace
 
 class TooltipControllerCaptureTest : public TooltipControllerTest {
  public:
   TooltipControllerCaptureTest() {}
   ~TooltipControllerCaptureTest() override {}
 
   void SetUp() override {
     TooltipControllerTest::SetUp();
     aura::client::SetScreenPositionClient(GetRootWindow(),
                                           &screen_position_client_);
 #if !defined(OS_CHROMEOS)
     desktop_screen_.reset(CreateDesktopScreen());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    desktop_screen_.get());
 #endif
   }
 
   void TearDown() override {
 #if !defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen());
     desktop_screen_.reset();
 #endif
     aura::client::SetScreenPositionClient(GetRootWindow(), NULL);
     TooltipControllerTest::TearDown();
   }
 
  private:
-  TestScreenPositionClient screen_position_client_;
+  wm::DefaultScreenPositionClient screen_position_client_;
   scoped_ptr<gfx::Screen> desktop_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerCaptureTest);
 };
 
 // Verifies when capture is released the TooltipController resets state.
 // Flaky on all builders.  http://crbug.com/388268
 TEST_F(TooltipControllerCaptureTest, DISABLED_CloseOnCaptureLost) {
   view_->GetWidget()->SetCapture(view_);
   RunAllPendingInMessageLoop();
@@ skipping 338 matching lines @@
   helper_->FireTooltipTimer();
   tooltip_bounds1 = test_tooltip_->location();
 
   EXPECT_NE(tooltip_bounds1_1, tooltip_bounds1);
   EXPECT_EQ(reference_string, helper_->GetTooltipText());
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views