Fix a DCHECK failure in PopupMenuImpl::setValueAndClosePopup().

third_party/WebKit/Source/web/PopupMenuImpl.cpp

 // Copyright (c) 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 "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
@@ skipping 376 matching lines @@
 void PopupMenuImpl::selectFontsFromOwnerDocument(Document& document)
 {
     Document& ownerDocument = ownerElement().document();
     document.styleEngine().setFontSelector(PopupMenuCSSFontSelector::create(&document, ownerDocument.styleEngine().fontSelector()));
 }
 
 void PopupMenuImpl::setValueAndClosePopup(int numValue, const String& stringValue)
 {
     DCHECK(m_popup);
     DCHECK(m_ownerElement);
-    bool success;
-    int listIndex = stringValue.toInt(&success);
-    DCHECK(success);
-    {
+    if (!stringValue.isEmpty()) {
+        bool success;
+        int listIndex = stringValue.toInt(&success);
+        DCHECK(success);
+
         EventQueueScope scope;
         m_ownerElement->selectOptionByPopup(listIndex);
         if (m_popup)
             m_chromeClient->closePagePopup(m_popup);
         // 'change' event is dispatched here.  For compatbility with
         // Angular 1.2, we need to dispatch a change event before
         // mouseup/click events.
+    } else {
+        if (m_popup)
+            m_chromeClient->closePagePopup(m_popup);
     }
     // We dispatch events on the owner element to match the legacy behavior.
     // Other browsers dispatch click events before and after showing the popup.
     if (m_ownerElement) {
         PlatformMouseEvent event;
         Element* owner = &ownerElement();
         owner->dispatchMouseEvent(event, EventTypeNames::mouseup);
         owner->dispatchMouseEvent(event, EventTypeNames::click);
     }
 }
@@ skipping 103 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_ownerElement = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink