aura: Close fullscreen RenderWidgetHostViewAura on blur.

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 0c7e6a4cee4a2feb7c3a8d611aa73db5ff1ad9be..05ffe74ec132f91d31b855be0ffddf1270aab810 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -5,56 +5,105 @@
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
+#include "base/message_loop.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/public/browser/render_widget_host_view.h"
+#include "content/test/mock_render_process_host.h"
+#include "content/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/env.h"
+#include "ui/aura/monitor_manager.h"
+#include "ui/aura/root_window.h"
+#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/test_screen.h"
+#include "ui/aura/test/test_stacking_client.h"
+#include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/gfx/screen.h"
 
-using content::RenderWidgetHostView;
-using content::RenderViewHostImplTestHarness;
+// Simple observer that keeps track of changes to a window for tests.
+class TestWindowObserver : public aura::WindowObserver {
+ public:
+  explicit TestWindowObserver(aura::Window* window_to_observe)
+      : window_(window_to_observe) {
+    window_->AddObserver(this);
+  }
+  virtual ~TestWindowObserver() {
+    if (window_)
+      window_->RemoveObserver(this);
+  }
+
+  bool destroyed() const { return destroyed_; }
+
+  // aura::WindowObserver overrides:
+  virtual void OnWindowDestroyed(aura::Window* window) {
+    CHECK_EQ(window, window_);
+    destroyed_ = true;
+    window_ = NULL;
+  }
+
+ private:
+  // Window that we're observing, or NULL if it's been destroyed.
+  aura::Window* window_;
+
+  // Was |window_| destroyed?
+  bool destroyed_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWindowObserver);
+};
 
-// This approach (of using RenderViewHostImplTestHarness's
-// RenderViewHost for a new RenderWidgetHostView) is borrowed from
-// RenderWidgetHostViewMacTest.
-class RenderWidgetHostViewAuraTest : public RenderViewHostImplTestHarness {
+class RenderWidgetHostViewAuraTest : public testing::Test {
  public:
-  RenderWidgetHostViewAuraTest() : old_rwhv_(NULL) {}
+  RenderWidgetHostViewAuraTest() {}
 
   virtual void SetUp() {
-    RenderViewHostImplTestHarness::SetUp();
-    old_rwhv_ = rvh()->GetView();
-    rwhv_aura_ = static_cast<RenderWidgetHostViewAura*>(
-        RenderWidgetHostView::CreateViewForWidget(rvh()));
+    aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+    root_window_.reset(
+        aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
+    gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
+    test_stacking_client_.reset(
+        new aura::test::TestStackingClient(root_window_.get()));
+
+    browser_context_.reset(new TestBrowserContext);
+    content::MockRenderProcessHost* process_host =
+        new content::MockRenderProcessHost(browser_context_.get());
+    widget_host_ =
+        new content::RenderWidgetHostImpl(process_host, MSG_ROUTING_NONE);
+    view_ = static_cast<RenderWidgetHostViewAura*>(
+        content::RenderWidgetHostView::CreateViewForWidget(widget_host_));
   }
 
   virtual void TearDown() {
-    aura::Window* window = rwhv_aura_->GetNativeView();
-    if (window->parent())
-      window->parent()->RemoveChild(window);
-    rwhv_aura_->Destroy();
-    // Destroying RWHV sets the host's view to NULL, so destroying view first,
-    // then set the view.
-    test_rvh()->SetView(old_rwhv_);
-    RenderViewHostImplTestHarness::TearDown();
+    if (view_)
+      view_->Destroy();
+    delete widget_host_;
+    message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
+    message_loop_.RunAllPending();
   }
 
  protected:
-  RenderWidgetHostViewAura* rwhv_aura_;
+  MessageLoopForUI message_loop_;
+  scoped_ptr<aura::RootWindow> root_window_;
+  scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
+  scoped_ptr<content::BrowserContext> browser_context_;
 
- private:
-  RenderWidgetHostView* old_rwhv_;
+  // Tests should set these to NULL if they've already triggered their
+  // destruction.
+  content::RenderWidgetHostImpl* widget_host_;
+  RenderWidgetHostViewAura* view_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAuraTest);
 };
 
 // Checks that a fullscreen view has the correct show-state and receives the
 // focus.
-TEST_F(RenderWidgetHostViewAuraTest, Fullscreen) {
-  rwhv_aura_->InitAsFullscreen(NULL);
-
-  aura::Window* window = rwhv_aura_->GetNativeView();
+TEST_F(RenderWidgetHostViewAuraTest, FocusFullscreen) {
+  view_->InitAsFullscreen(NULL);
+  aura::Window* window = view_->GetNativeView();
   ASSERT_TRUE(window != NULL);
   EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN,
             window->GetProperty(aura::client::kShowStateKey));
@@ -64,5 +113,28 @@ TEST_F(RenderWidgetHostViewAuraTest, Fullscreen) {
 
   // Check that we'll also say it's okay to activate the window when there's an
   // ActivationClient defined.
-  EXPECT_TRUE(rwhv_aura_->ShouldActivate(NULL));
+  EXPECT_TRUE(view_->ShouldActivate(NULL));
+}
+
+// Checks that a fullscreen view is destroyed when it loses the focus.
+TEST_F(RenderWidgetHostViewAuraTest, DestroyFullscreenOnBlur) {
+  view_->InitAsFullscreen(NULL);
+  aura::Window* window = view_->GetNativeView();
+  ASSERT_TRUE(window != NULL);
+  ASSERT_TRUE(window->HasFocus());
+
+  // After we create and focus another window, the RWHVA's window should be
+  // destroyed.
+  TestWindowObserver observer(window);
+  aura::test::TestWindowDelegate delegate;
+  scoped_ptr<aura::Window> sibling(new aura::Window(&delegate));
+  sibling->Init(ui::LAYER_TEXTURED);
+  sibling->Show();
+  window->parent()->AddChild(sibling.get());
+  sibling->Focus();
+  ASSERT_TRUE(sibling->HasFocus());
+  ASSERT_TRUE(observer.destroyed());
+
+  widget_host_ = NULL;
+  view_ = NULL;
 }