ChromeOS MD: Fix cannot drag tab onto immersive fullscreen window

chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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_drag_controller_interactive_uitest.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
+#include "ash/common/material_design/material_design_controller.h"

[sky, 2017/01/18 16:40:45]

Move to USE_ASH ifdef below.

[Qiang(Joe) Xu, 2017/01/20 17:36:24]

Done.

 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 2070 matching lines @@
   // Put the second browser into immersive fullscreen.
   BrowserView* browser_view2 = BrowserView::GetBrowserViewForBrowser(browser2);
   ImmersiveModeController* immersive_controller2 =
       browser_view2->immersive_mode_controller();
   ASSERT_EQ(ImmersiveModeController::Type::ASH, immersive_controller2->type());
   ash::ImmersiveFullscreenControllerTestApi(
       static_cast<ImmersiveModeControllerAsh*>(immersive_controller2)
           ->controller())
       .SetupForTest();
   chrome::ToggleFullscreenMode(browser2);
+  // For MD, the browser's top chrome is completely hidden in immersive
+  // fullscreen mode.
   ASSERT_TRUE(immersive_controller2->IsEnabled());
   ASSERT_FALSE(immersive_controller2->IsRevealed());
-  ASSERT_TRUE(tab_strip2->IsImmersiveStyle());
+  bool is_using_material_design =
+      ash::MaterialDesignController::IsImmersiveModeMaterial();
+  if (is_using_material_design) {

[sky, 2017/01/17 18:07:01]

Is this test run in both md and non-md?

[Qiang(Joe) Xu, 2017/01/18 01:13:52]

I don't know.. Do you mean it may not actually run for MD since this test
doesn't setup ash?

[sky, 2017/01/18 16:40:45]

You have two code paths here, one md and one non-md. Are they both exercised?
How?
 It looks like the test is disabled. Can you fix it, otherwise we're getting no
coverage.

[yiyix, 2017/01/18 20:41:50]

I think the test is running with the default value of ash-md flag, with which
function IsImersiveModeMaterial() always return true.

Regarding comment "completely hidden in immersive fullscreen mode.", both
immersive mode and fullscreen mode exist in chromeos and they are different.
Could you clarify which mode you refer to? I think you mean immersive mode.

[Qiang(Joe) Xu, 2017/01/20 17:36:24]

It seems is_using_material_deisn is exercised right now. Currently I don't know
how to fix the test yet. It waits forever on
DragTabToWindowInSeparateDisplayStep2 and constatnly fails on chromeos.

[Qiang(Joe) Xu, 2017/01/20 17:36:24]

I think "immersive fullscreen" means "immersive unrevealed". It is used in many
places in the code base.

+    ASSERT_FALSE(tab_strip2->visible());
+  } else {
+    ASSERT_TRUE(tab_strip2->visible());
+    ASSERT_TRUE(tab_strip2->IsImmersiveStyle());
+  }
 
   // Move to the first tab and drag it enough so that it detaches, but not
   // enough that it attaches to browser2.
   gfx::Point tab_0_center(GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
   ASSERT_TRUE(PressInput(tab_0_center));
   ASSERT_TRUE(DragInputToNotifyWhenDone(
                   tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
                   base::Bind(&DragTabToWindowInSeparateDisplayStep2,
                              this, tab_strip, tab_strip2)));
   QuitWhenNotDragging();
 
   // Should now be attached to tab_strip2.
   ASSERT_TRUE(tab_strip2->IsDragSessionActive());
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
 
   // browser2's top chrome should be revealed and the tab strip should be
   // at normal height while user is tragging tabs_strip2's tabs.
   ASSERT_TRUE(immersive_controller2->IsRevealed());
   ASSERT_FALSE(tab_strip2->IsImmersiveStyle());
+  ASSERT_TRUE(tab_strip2->visible());
 
   // Release the mouse, stopping the drag session.
   ASSERT_TRUE(ReleaseInput());
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
   EXPECT_EQ("0 100", IDString(browser2->tab_strip_model()));
   EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
 
   // Move the mouse off of browser2's top chrome.
   aura::Window* primary_root = roots[0];
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
                   primary_root->GetBoundsInScreen().CenterPoint()));
 
   // The first browser window should not be in immersive fullscreen.
   // browser2 should still be in immersive fullscreen, but the top chrome should
   // no longer be revealed.
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   EXPECT_FALSE(browser_view->immersive_mode_controller()->IsEnabled());
 
   EXPECT_TRUE(immersive_controller2->IsEnabled());
   EXPECT_FALSE(immersive_controller2->IsRevealed());
-  EXPECT_TRUE(tab_strip2->IsImmersiveStyle());
+  if (is_using_material_design) {
+    EXPECT_FALSE(tab_strip2->visible());
+  } else {
+    EXPECT_TRUE(tab_strip2->visible());
+    EXPECT_TRUE(tab_strip2->IsImmersiveStyle());
+  }
 }
 
 // Subclass of DetachToBrowserTabDragControllerTest that
 // creates multiple displays with different device scale factors.
 class DifferentDeviceScaleFactorDisplayTabDragControllerTest
     : public DetachToBrowserTabDragControllerTest {
  public:
   DifferentDeviceScaleFactorDisplayTabDragControllerTest() {}
   virtual ~DifferentDeviceScaleFactorDisplayTabDragControllerTest() {}
 
@@ skipping 391 matching lines @@
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse", "touch"));
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTestTouch,
                         ::testing::Values("touch"));
 #else
 INSTANTIATE_TEST_CASE_P(TabDragging,
                         DetachToBrowserTabDragControllerTest,
                         ::testing::Values("mouse"));
 #endif