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

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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 75 matching lines @@
 
     // TODO: these tests use GetContext(). That should go away for aura-mus
     // client. http://crbug.com/663781.
     if (IsAuraMusClient())
       return;
 
     aura::Window* root_window = GetContext();
 
     new wm::DefaultActivationClient(root_window);
 #if defined(OS_CHROMEOS)
-    controller_.reset(
-        new TooltipController(std::unique_ptr<views::corewm::Tooltip>(
-            new views::corewm::TooltipAura)));
+    tooltip_aura_ = new views::corewm::TooltipAura();
+    controller_.reset(new TooltipController(
+        std::unique_ptr<views::corewm::Tooltip>(tooltip_aura_)));
     root_window->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window, controller_.get());
 #endif
     widget_.reset(CreateWidget(root_window));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
     helper_.reset(new TooltipControllerTestHelper(
                       GetController(widget_.get())));
@@ skipping 45 matching lines @@
     view_->SetBounds(0, 0, 100, 100);
     view2->SetBounds(100, 0, 100, 100);
     return view2;
   }
 
   std::unique_ptr<views::Widget> widget_;
   TooltipTestView* view_;
   std::unique_ptr<TooltipControllerTestHelper> helper_;
   std::unique_ptr<ui::test::EventGenerator> generator_;
 
+ protected:
+#if defined(OS_CHROMEOS)
+  TooltipAura* tooltip_aura_;  // not owned.
+#endif
+
  private:
   std::unique_ptr<TooltipController> controller_;
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
 };
 
@@ skipping 18 matching lines @@
   // Fire tooltip timer so tooltip becomes visible.
   helper_->FireTooltipTimer();
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   generator_->MoveMouseBy(1, 0);
 
   EXPECT_TRUE(helper_->IsTooltipVisible());
   EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(GetWindow()));
   EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
+  EXPECT_EQ(1u, tooltip_aura_->GetLineSizeForTest());
 }
 
+#if defined(OS_CHROMEOS)
+// crbug.com/664370.
+TEST_F(TooltipControllerTest, MaxWidth) {
+  base::string16 text = base::ASCIIToUTF16(
+      "List of law clerks of the Supreme Court of the United States - "
+      "Wikipedia\n");
+  text += gfx::kEllipsisUTF16 + base::ASCIIToUTF16("wikipedia.org/") +
+          gfx::kEllipsisUTF16 +
+          base::ASCIIToUTF16(
+              "/List_of_law_clerks_of_the_Supreme_Court_of_the_Unite") +
+          +gfx::kEllipsisUTF16;
+
+  view_->set_tooltip_text(text);
+  generator_->MoveMouseToCenterOf(GetWindow());
+
+  // Fire tooltip timer so tooltip becomes visible.
+  helper_->FireTooltipTimer();
+
+  EXPECT_TRUE(helper_->IsTooltipVisible());
+  EXPECT_EQ(2u, tooltip_aura_->GetLineSizeForTest());
+}
+#endif
+
 TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
   // TODO: these tests use GetContext(). That should go away for aura-mus
   // client. http://crbug.com/663781.
   if (IsAuraMusClient())
     return;
 
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
@@ skipping 658 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