<webview>: Fix an issue with destroying an opener that has unattached guests.

chrome/browser/apps/web_view_interactive_browsertest.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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 19 matching lines @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 using extensions::AppWindow;
 
 class TestGuestViewManager : public extensions::GuestViewManager {
  public:
-  explicit TestGuestViewManager(content::BrowserContext* context) :
-      GuestViewManager(context),
-      web_contents_(NULL) {}
+  explicit TestGuestViewManager(content::BrowserContext* context)
+      : GuestViewManager(context),
+        guest_add_count_(0),
+        guest_remove_count_(0),
+        web_contents_(NULL) {}
 
-  content::WebContents* WaitForGuestCreated() {
+  content::WebContents* WaitForGuestAdded() {
     if (web_contents_)
       return web_contents_;
 
-    message_loop_runner_ = new content::MessageLoopRunner;
-    message_loop_runner_->Run();
+    add_message_loop_runner_ = new content::MessageLoopRunner;
+    add_message_loop_runner_->Run();
     return web_contents_;
   }
 
+  void WaitForGuestRemoved(size_t expected_remove_count) {
+    if (expected_remove_count == guest_remove_count_)
+      return;
+
+    remove_message_loop_runner_ = new content::MessageLoopRunner;
+    remove_message_loop_runner_->Run();
+  }
+
+  size_t guest_add_count() { return guest_add_count_; }
+
  private:
   // GuestViewManager override:
   virtual void AddGuest(int guest_instance_id,
                         content::WebContents* guest_web_contents) OVERRIDE{
     GuestViewManager::AddGuest(guest_instance_id, guest_web_contents);
     web_contents_ = guest_web_contents;
+    ++guest_add_count_;
 
-    if (message_loop_runner_.get())
-      message_loop_runner_->Quit();
+    if (add_message_loop_runner_.get())
+      add_message_loop_runner_->Quit();
   }
 
+  virtual void RemoveGuest(int guest_instance_id) OVERRIDE {
+    GuestViewManager::RemoveGuest(guest_instance_id);
+    ++guest_remove_count_;
+
+    if (remove_message_loop_runner_.get())
+      remove_message_loop_runner_->Quit();
+  }
+
+  size_t guest_add_count_;
+  size_t guest_remove_count_;
   content::WebContents* web_contents_;
-  scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
+  scoped_refptr<content::MessageLoopRunner> add_message_loop_runner_;
+  scoped_refptr<content::MessageLoopRunner> remove_message_loop_runner_;
 };
 
 // Test factory for creating test instances of GuestViewManager.
 class TestGuestViewManagerFactory : public extensions::GuestViewManagerFactory {
  public:
   TestGuestViewManagerFactory() :
       test_guest_view_manager_(NULL) {}
 
   virtual ~TestGuestViewManagerFactory() {}
 
@@ skipping 175 matching lines @@
                   const std::string& app_location,
                   TestServer test_server) {
     content::WebContents* embedder_web_contents = NULL;
     scoped_ptr<ExtensionTestMessageListener> done_listener(
         RunAppHelper(
             test_name, app_location, test_server, &embedder_web_contents));
 
     ASSERT_TRUE(done_listener);
     ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 
-    guest_web_contents_ = GetGuestViewManager()->WaitForGuestCreated();
+    guest_web_contents_ = GetGuestViewManager()->WaitForGuestAdded();
   }
 
   void RunTest(const std::string& app_name) {
   }
   void SetupTest(const std::string& app_name,
                  const std::string& guest_url_spec) {
     ASSERT_TRUE(StartEmbeddedTestServer());
     GURL::Replacements replace_host;
     std::string host_str("localhost");  // Must stay in scope with replace_host.
     replace_host.SetHostStr(host_str);
@@ skipping 552 matching lines @@
 #else
   ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
       GetPlatformAppWindow(), ui::VKEY_RETURN,
       true /* ctrl */, false, false, false));
 #endif
 
   // Wait for the embedder to receive a 'newwindow' event.
   ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 }
 
+IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
+                       NewWindow_OpenerDestroyedBeforeAttach) {
+  TestHelper("testNewWindowOpenerDestroyedBeforeAttach",
+             "web_view/newwindow",
+             NEEDS_TEST_SERVER);
+  EXPECT_EQ(2u, GetGuestViewManager()->guest_add_count());
+
+  // We have two guests in this test, one is the intial one, the other
+  // is the newwindow one.
+  // Before the embedder goes away, both the guests should go away.
+  // This ensures that unattached guests are gone if opener is gone.
+  GetGuestViewManager()->WaitForGuestRemoved(2u);
+}
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, ExecuteCode) {
   ASSERT_TRUE(RunPlatformAppTestWithArg(
       "platform_apps/web_view/common", "execute_code")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PopupPositioningBasic) {
   TestHelper("testBasic", "web_view/popup_positioning", NO_TEST_SERVER);
   ASSERT_TRUE(guest_web_contents());
   PopupTestHelper(gfx::Point());
@@ skipping 263 matching lines @@
 
   // Now verify that the selection text propagates properly to RWHV.
   content::RenderWidgetHostView* guest_rwhv =
       guest_web_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(guest_rwhv);
   std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
   ASSERT_TRUE(selected_text.size() >= 10u);
   ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
 }
 #endif