Fix ImmersiveModeControllerAshTestWithBrowserView.Layout

chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc

 // Copyright 2013 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/frame/immersive_mode_controller_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 90 matching lines @@
     widget_->Show();
 
     top_container_ = new views::View();
     top_container_->SetBounds(0, 0, 500, 100);
     top_container_->set_focusable(true);
 
     widget_->GetContentsView()->AddChildView(top_container_);
 
     controller_->Init(delegate_.get(), widget_, top_container_);
     SetAnimationsDisabled(true);
+
+    // The mouse is moved so that it is not over |top_container_| by
+    // AshTestBase.
   }
 
   // Enable or disable the immersive mode controller's animations. When the
   // immersive mode controller's animations are disabled, some behavior is
   // slightly different. In particular, the behavior is different when there
   // is a transfer in which lock keeps the top-of-window views revealed (eg
   // bubble keeps top-of-window views revealed -> mouse keeps top-of-window
   // views revealed). It is necessary to temparily enable the immersive
   // controller's animations to get the correct behavior in tests.
   void SetAnimationsDisabled(bool disabled) {
@@ skipping 678 matching lines @@
     TestWithBrowserView::SetUp();
 
     browser()->window()->Show();
 
     ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest();
     ASSERT_TRUE(ImmersiveFullscreenConfiguration::UseImmersiveFullscreen());
 
     controller_ = static_cast<ImmersiveModeControllerAsh*>(
         browser_view()->immersive_mode_controller());
     controller_->DisableAnimationsForTest();
+
+    // Move the mouse so that it is not over the top-of-window views. The mouse
+    // position matters because entering immersive fullscreen causes synthesized
+    // mouse moves. (If the mouse is at the very top of the screen when entering
+    // immersive fullscreen, the top-of-window views will hide, then reveal as
+    // a result of the synthesized mouse moves).
+    controller()->SetMouseHoveredForTest(false);
   }
 
   // Returns the bounds of |view| in widget coordinates.
   gfx::Rect GetBoundsInWidget(views::View* view) {
     return view->ConvertRectToWidget(view->GetLocalBounds());
   }
 
   ImmersiveModeControllerAsh* controller() { return controller_; }
 
  private:
   // Not owned.
   ImmersiveModeControllerAsh* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestWithBrowserView);
 };
 
 // Test the layout and visibility of the tabstrip, toolbar and TopContainerView
 // in immersive fullscreen.
-// Flaky. See http://crbug.com/302908 .
-TEST_F(ImmersiveModeControllerAshTestWithBrowserView, DISABLED_Layout) {
+TEST_F(ImmersiveModeControllerAshTestWithBrowserView, Layout) {
   AddTab(browser(), GURL("about:blank"));
 
   TabStrip* tabstrip = browser_view()->tabstrip();
   ToolbarView* toolbar = browser_view()->toolbar();
   views::WebView* contents_web_view =
       browser_view()->GetContentsWebViewForTest();
 
   // Immersive fullscreen starts out disabled.
   ASSERT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   ASSERT_FALSE(controller()->IsEnabled());
@@ skipping 121 matching lines @@
 
   browser_view()->GetWidget()->Restore();
   // Exiting immersive fullscreen occurs as a result of a task posted to the
   // message loop.
   content::RunAllPendingInMessageLoop();
 
   EXPECT_FALSE(controller()->IsEnabled());
 }
 
 #endif  // defined(OS_CHROMEOS)