Tab and TabCloseButton should implement MaskedTargeterDelegate

chrome/browser/ui/views/tabs/tab_strip_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_strip.h"
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip_observer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Walks up the views hierarchy until it finds a tab view. It returns the
 // found tab view, on NULL if none is found.
 views::View* FindTabView(views::View* view) {
   views::View* current = view;
   while (current && strcmp(current->GetClassName(), Tab::kViewClassName)) {
     current = current->parent();
@@ skipping 89 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     widget_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   // Returns the rectangular hit test region of |tab| in |tab|'s local
   // coordinate space.
   gfx::Rect GetTabHitTestMask(Tab* tab) {
+    views::ViewTargeter* targeter = tab->targeter();
+    DCHECK(targeter);
+    views::MaskedTargeterDelegate* delegate =
+        static_cast<views::MaskedTargeterDelegate*>(tab);
+
     gfx::Path mask;
-    tab->GetHitTestMaskDeprecated(views::View::HIT_TEST_SOURCE_TOUCH, &mask);
+    bool valid_mask = delegate->GetHitTestMask(&mask);
+    DCHECK(valid_mask);
+
     return gfx::ToEnclosingRect((gfx::SkRectToRectF(mask.getBounds())));
   }
 
   // Returns the rectangular hit test region of the tab close button of
   // |tab| in |tab|'s coordinate space (including padding if |padding|
   // is true).
   gfx::Rect GetTabCloseHitTestMask(Tab* tab, bool padding) {
     gfx::RectF bounds_f = tab->close_button_->GetContentsBounds();
     if (padding)
       bounds_f = tab->close_button_->GetLocalBounds();
@@ skipping 482 matching lines @@
   ASSERT_TRUE(IsPointInTab(most_right_tab, unactive_overlap));
 
   EXPECT_EQ(
       right_tab,
       FindTabView(tab_strip_->GetTooltipHandlerForPoint(unactive_overlap)));
 
   // Confirm that tab strip doe not return tooltip handler for points that
   // don't hit it.
   EXPECT_FALSE(tab_strip_->GetTooltipHandlerForPoint(gfx::Point(-1, 2)));
 }