Misc. Tab-related cleanup.

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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 233 matching lines @@
   }
 
   std::string original_locale_;
 };
 
 TEST_F(TabTest, HitTestTopPixel) {
   Widget widget;
   InitWidget(&widget);
 
   FakeTabController tab_controller;
-  Tab tab(&tab_controller);
+  Tab tab(&tab_controller, nullptr);
   widget.GetContentsView()->AddChildView(&tab);
   tab.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), Tab::GetStandardSize()));
 
   // Tabs are slanted, so a click halfway down the left edge won't hit it.
   int middle_y = tab.height() / 2;
   EXPECT_FALSE(tab.HitTestPoint(gfx::Point(0, middle_y)));
 
   // Normally, tabs should not be hit if we click in the exclusion region, only
   // if we click below it.
   const int exclusion = GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT);
@@ skipping 14 matching lines @@
 TEST_F(TabTest, LayoutAndVisibilityOfElements) {
   static const TabMediaState kMediaStatesToTest[] = {
     TAB_MEDIA_STATE_NONE, TAB_MEDIA_STATE_CAPTURING,
     TAB_MEDIA_STATE_AUDIO_PLAYING, TAB_MEDIA_STATE_AUDIO_MUTING
   };
 
   Widget widget;
   InitWidget(&widget);
 
   FakeTabController controller;
-  Tab tab(&controller);
+  Tab tab(&controller, nullptr);
   widget.GetContentsView()->AddChildView(&tab);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(16, 16);
   TabRendererData data;
   data.favicon = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 
   // Perform layout over all possible combinations, checking for correct
   // results.
   for (int is_pinned_tab = 0; is_pinned_tab < 2; ++is_pinned_tab) {
@@ skipping 34 matching lines @@
 }
 
 // Regression test for http://crbug.com/420313: Confirms that any child Views of
 // Tab do not attempt to provide their own tooltip behavior/text. It also tests
 // that Tab provides the expected tooltip text (according to tab_utils).
 TEST_F(TabTest, TooltipProvidedByTab) {
   Widget widget;
   InitWidget(&widget);
 
   FakeTabController controller;
-  Tab tab(&controller);
+  Tab tab(&controller, nullptr);
   widget.GetContentsView()->AddChildView(&tab);
   tab.SetBoundsRect(gfx::Rect(Tab::GetStandardSize()));
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(16, 16);
   TabRendererData data;
   data.favicon = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 
   data.title = base::UTF8ToUTF16(
       "This is a really long tab title that would case views::Label to provide "
@@ skipping 29 matching lines @@
       EXPECT_EQ(chrome::AssembleTabTooltipText(data.title, data.media_state),
                 tooltip);
     }
   }
 }
 
 // Regression test for http://crbug.com/226253. Calling Layout() more than once
 // shouldn't change the insets of the close button.
 TEST_F(TabTest, CloseButtonLayout) {
   FakeTabController tab_controller;
-  Tab tab(&tab_controller);
+  Tab tab(&tab_controller, nullptr);
   tab.SetBounds(0, 0, 100, 50);
   LayoutTab(&tab);
   gfx::Insets close_button_insets = GetCloseButton(tab)->GetInsets();
   LayoutTab(&tab);
   gfx::Insets close_button_insets_2 = GetCloseButton(tab)->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, GetCloseButton(tab)->bounds().height());
 }
 
 // Tests expected changes to the ThrobberView state when the WebContents loading
 // state changes or the animation timer (usually in BrowserView) triggers.
 TEST_F(TabTest, LayeredThrobber) {
   Widget widget;
   InitWidget(&widget);
 
   FakeTabController tab_controller;
-  Tab tab(&tab_controller);
+  Tab tab(&tab_controller, nullptr);
   widget.GetContentsView()->AddChildView(&tab);
   tab.SetBoundsRect(gfx::Rect(Tab::GetStandardSize()));
 
   views::View* throbber = GetThrobberView(tab);
   EXPECT_FALSE(throbber->visible());
   EXPECT_EQ(TabRendererData::NETWORK_STATE_NONE, tab.data().network_state);
   EXPECT_EQ(throbber->bounds(), GetFaviconBounds(tab));
 
   tab.UpdateLoadingAnimation(TabRendererData::NETWORK_STATE_NONE);
   EXPECT_FALSE(throbber->visible());
@@ skipping 30 matching lines @@
   tab_controller.set_paint_throbber_to_layer(false);
   tab.UpdateLoadingAnimation(TabRendererData::NETWORK_STATE_WAITING);
   EXPECT_TRUE(throbber->visible());
   EXPECT_FALSE(throbber->layer());
   tab.UpdateLoadingAnimation(TabRendererData::NETWORK_STATE_NONE);
   EXPECT_FALSE(throbber->visible());
 }
 
 TEST_F(TabTest, TitleHiddenWhenSmall) {
   FakeTabController tab_controller;
-  Tab tab(&tab_controller);
+  Tab tab(&tab_controller, nullptr);
   tab.SetBounds(0, 0, 100, 50);
   EXPECT_GT(GetTitleWidth(tab), 0);
   tab.SetBounds(0, 0, 0, 50);
   EXPECT_EQ(0, GetTitleWidth(tab));
 }