Don't subtract border from max size for display rect.

ui/views/corewm/tooltip_aura.cc

 // Copyright 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_aura.h"
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/render_text.h"
+#include "ui/gfx/test/render_text_test_api.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ skipping 108 matching lines @@
     // opaque.
     render_text_->set_subpixel_rendering_suppressed(
         SkColorGetA(background_color) != 0xFF);
   }
 
   void SetMaxWidth(int width) {
     max_width_ = width;
     ResetDisplayRect();
   }
 
+  size_t GetLineSizeForTest() {
+    return gfx::test::RenderTextTestApi(render_text_.get()).lines().size();
+  }
+
  private:
   void ResetDisplayRect() {
-    gfx::Insets insets = border()->GetInsets();
-    int max_text_width = max_width_ - insets.width();
-    render_text_->SetDisplayRect(gfx::Rect(0, 0, max_text_width, 100000));
+    render_text_->SetDisplayRect(gfx::Rect(0, 0, max_width_, 100000));
   }
 
   std::unique_ptr<gfx::RenderText> render_text_;
   int max_width_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipView);
 };
 
 TooltipAura::TooltipAura()
     : tooltip_view_(new TooltipView),
       widget_(NULL),
       tooltip_window_(NULL) {
 }
 
 TooltipAura::~TooltipAura() {
   DestroyWidget();
 }
 
+size_t TooltipAura::GetLineSizeForTest() {
+  return tooltip_view_->GetLineSizeForTest();
+}
+
 void TooltipAura::SetTooltipBounds(const gfx::Point& mouse_pos,
                                    const gfx::Size& tooltip_size) {
   gfx::Rect tooltip_rect(mouse_pos, tooltip_size);
   tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY);
   display::Screen* screen = display::Screen::GetScreen();
   gfx::Rect display_bounds(screen->GetDisplayNearestPoint(mouse_pos).bounds());
 
   // If tooltip is out of bounds on the x axis, we simply shift it
   // horizontally by the offset.
   if (tooltip_rect.right() > display_bounds.right()) {
@@ skipping 64 matching lines @@
 }
 
 void TooltipAura::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(widget_, widget);
   widget_ = NULL;
   tooltip_window_ = NULL;
 }
 
 }  // namespace corewm
 }  // namespace views