Tooltip Cleanup

ui/views/corewm/tooltip_controller_unittest.cc

Index: ui/views/corewm/tooltip_controller_unittest.cc
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index 0ce3fb4ac3af3e1618e2a8a3407c40a37d4c3c0d..ad341d965294a097eae95e0417988c549ff3295c 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -90,7 +90,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
 #if defined(OS_CHROMEOS)
     controller_.reset(new TooltipController(
           scoped_ptr<views::corewm::Tooltip>(
-              new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE))));
+              new views::corewm::TooltipAura)));
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
 #endif
@@ -532,6 +532,10 @@ class TestTooltip : public Tooltip {
   const base::string16& tooltip_text() const { return tooltip_text_; }
 
   // Tooltip:
+  int GetMaxWidth(const gfx::Point& location,
+                  aura::Window* context) const override {
+    return 100;
+  }
   void SetText(aura::Window* window,
                const base::string16& tooltip_text,
                const gfx::Point& location) override {