Remove sundry IsModeMaterial checks.

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/macros.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"
@@ skipping 311 matching lines @@
   int immersive_height = Tab::GetImmersiveHeight();
   EXPECT_EQ(immersive_height, tab_strip_->GetPreferredSize().height());
 
   // Sanity-check immersive tabs are shorter than normal tabs.
   EXPECT_LT(immersive_height, normal_height);
 }
 
 // Creates a tab strip in stacked layout mode and verifies the correctness
 // of hit tests against the visible/occluded regions of a tab and the tab
 // close button of the active tab.
-TEST_F(TabStripTest, TabHitTestMaskWhenStacked) {
-  // TODO(varkha,pkasting): Update the test for Material Design layout.
-  // crbug.com/575327
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    VLOG(1) << "Test is DISABLED for material design layouts.";
-    return;
-  }
-
+// TODO(varkha,pkasting): Update the test for Material Design layout.

[Peter Kasting, 2016/10/11 22:49:18]

Just set the TODO to me alone.

[Evan Stade, 2016/10/12 00:13:07]

Done.

+// crbug.com/575327
+TEST_F(TabStripTest, DISABLED_TabHitTestMaskWhenStacked) {
   tab_strip_->SetBounds(0, 0, 300, 20);
 
   controller_->AddTab(0, false);
   controller_->AddTab(1, true);
   controller_->AddTab(2, false);
   controller_->AddTab(3, false);
   ASSERT_EQ(4, tab_strip_->tab_count());
 
   Tab* left_tab = tab_strip_->tab_at(0);
   left_tab->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), gfx::Size(200, 20)));
@@ skipping 307 matching lines @@
 
   // Change the title of the second tab (first tab is selected).
   tab_strip_->TabTitleChangedNotLoading(1);
   // Indicator should be shown.
   EXPECT_TRUE(IsShowingPinnedTabTitleChangedIndicator(1));
   // Select the second tab.
   controller_->SelectTab(1);
   // Indicator should hide.
   EXPECT_FALSE(IsShowingPinnedTabTitleChangedIndicator(1));
 }