Merge to branch 2214 [Password Generation] Hide popup if view can not be created.

chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc

Index: chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
diff --git a/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc b/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
index 67bcc377e27217a1112380285041d3b7ef7aa1ff..21c74ad0fc54432f6f7f08a484aa7c1b8488743e 100644
--- a/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
+++ b/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
@@ -39,13 +39,12 @@ class TestPasswordGenerationPopupController :
 
 class PasswordGenerationPopupViewTest : public InProcessBrowserTest {
  public:
-  void SetUpOnMainThread() override {
-    gfx::NativeView native_view =
-        browser()->tab_strip_model()->GetActiveWebContents()->GetNativeView();
+  content::WebContents* GetWebContents() {
+    return browser()->tab_strip_model()->GetActiveWebContents();
+  }
 
-    controller_ =
-        new TestPasswordGenerationPopupController(
-            browser()->tab_strip_model()->GetActiveWebContents(), native_view);
+  gfx::NativeView GetNativeView() {
+    return GetWebContents()->GetNativeView();
   }
 
   scoped_ptr<PasswordGenerationPopupViewTester> GetViewTester() {
@@ -62,6 +61,8 @@ class PasswordGenerationPopupViewTest : public InProcessBrowserTest {
 // editing dialog doesn't crash.
 IN_PROC_BROWSER_TEST_F(PasswordGenerationPopupViewTest,
                        MouseMovementInEditingPopup) {
+  controller_ = new autofill::TestPasswordGenerationPopupController(
+      GetWebContents(), GetNativeView());
   controller_->Show(false /* display_password */);
 
   gfx::Point center_point =
@@ -72,6 +73,15 @@ IN_PROC_BROWSER_TEST_F(PasswordGenerationPopupViewTest,
   // Deletes |controller_|.
   controller_->HideAndDestroy();
 }
+
+// Verify that we calling Show() with an invalid container does not crash.
+// Regression test for crbug.com/439618.
+IN_PROC_BROWSER_TEST_F(PasswordGenerationPopupViewTest,
+                       InvalidContainerView) {
+  controller_ = new autofill::TestPasswordGenerationPopupController(
+      GetWebContents(), NULL);
+  controller_->Show(true /* display password */);
+}
 #endif
 
 }  // namespace autofill