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

chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc

 // Copyright 2014 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/autofill/password_generation_popup_view.h"
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_view_tester.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 21 matching lines @@
 
   ~TestPasswordGenerationPopupController() override {}
 
   PasswordGenerationPopupView* view() {
     return view_;
   }
 };
 
 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() {
     return PasswordGenerationPopupViewTester::For(controller_->view()).Pass();
   }
 
  protected:
   TestPasswordGenerationPopupController* controller_;
 };
 
 // TODO(gcasto): Enable on Mac when UI is updated. (crbug.com/394303)
 #if !defined(OS_MACOSX)
 // Regression test for crbug.com/400543. Verifying that moving the mouse in the
 // 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 =
       static_cast<PasswordGenerationPopupController*>(
           controller_)->popup_bounds().CenterPoint();
   GetViewTester()->SimulateMouseMovementAt(center_point);
 
   // 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