Reland: Use labels to display views tab titles.

chrome/browser/ui/views/tabs/tab_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab.h"
+
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
-
-#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using views::Widget;
 
 class FakeTabController : public TabController {
  public:
   FakeTabController() : immersive_style_(false), active_tab_(false) {
   }
   virtual ~FakeTabController() {}
@@ skipping 121 matching lines @@
             EXPECT_FALSE(tab.ShouldShowMediaIndicator());
           break;
       }
     }
 
     // Check positioning of elements with respect to each other, and that they
     // are fully within the contents bounds.
     const gfx::Rect contents_bounds = tab.GetContentsBounds();
     if (tab.ShouldShowIcon()) {
       EXPECT_LE(contents_bounds.x(), tab.favicon_bounds_.x());
-      if (tab.title_bounds_.width() > 0)
-        EXPECT_LE(tab.favicon_bounds_.right(), tab.title_bounds_.x());
+      if (tab.title_->width() > 0)
+        EXPECT_LE(tab.favicon_bounds_.right(), tab.title_->x());
       EXPECT_LE(contents_bounds.y(), tab.favicon_bounds_.y());
       EXPECT_LE(tab.favicon_bounds_.bottom(), contents_bounds.bottom());
     }
     if (tab.ShouldShowIcon() && tab.ShouldShowMediaIndicator())
       EXPECT_LE(tab.favicon_bounds_.right(), tab.media_indicator_bounds_.x());
     if (tab.ShouldShowMediaIndicator()) {
-      if (tab.title_bounds_.width() > 0)
-        EXPECT_LE(tab.title_bounds_.right(), tab.media_indicator_bounds_.x());
+      if (tab.title_->width() > 0) {
+        EXPECT_LE(tab.title_->bounds().right(),
+                  tab.media_indicator_bounds_.x());
+      }
       EXPECT_LE(tab.media_indicator_bounds_.right(), contents_bounds.right());
       EXPECT_LE(contents_bounds.y(), tab.media_indicator_bounds_.y());
       EXPECT_LE(tab.media_indicator_bounds_.bottom(), contents_bounds.bottom());
     }
     if (tab.ShouldShowMediaIndicator() && tab.ShouldShowCloseBox()) {
       // Note: The media indicator can overlap the left-insets of the close box,
       // but should otherwise be to the left of the close button.
       EXPECT_LE(tab.media_indicator_bounds_.right(),
                 tab.close_button_->bounds().x() +
                     tab.close_button_->GetInsets().left());
     }
     if (tab.ShouldShowCloseBox()) {
       // Note: The title bounds can overlap the left-insets of the close box,
       // but should otherwise be to the left of the close button.
-      if (tab.title_bounds_.width() > 0) {
-        EXPECT_LE(tab.title_bounds_.right(),
+      if (tab.title_->width() > 0) {
+        EXPECT_LE(tab.title_->bounds().right(),
                   tab.close_button_->bounds().x() +
                       tab.close_button_->GetInsets().left());
       }
       EXPECT_LE(tab.close_button_->bounds().right(), contents_bounds.right());
       EXPECT_LE(contents_bounds.y(), tab.close_button_->bounds().y());
       EXPECT_LE(tab.close_button_->bounds().bottom(), contents_bounds.bottom());
     }
   }
 };
 
@@ skipping 98 matching lines @@
   tab.Layout();
   gfx::Insets close_button_insets_2 = tab.close_button_->GetInsets();
   EXPECT_EQ(close_button_insets.top(), close_button_insets_2.top());
   EXPECT_EQ(close_button_insets.left(), close_button_insets_2.left());
   EXPECT_EQ(close_button_insets.bottom(), close_button_insets_2.bottom());
   EXPECT_EQ(close_button_insets.right(), close_button_insets_2.right());
 
   // Also make sure the close button is sized as large as the tab.
   EXPECT_EQ(50, tab.close_button_->bounds().height());
 }