Fix file chooser on ChromeOS.

chrome/browser/file_select_helper.cc

 // Copyright (c) 2012 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/file_select_helper.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 637 matching lines @@
 void FileSelectHelper::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, type);
   render_frame_host_ = nullptr;
 }
 
 void FileSelectHelper::RenderFrameHostChanged(
     content::RenderFrameHost* old_host,
     content::RenderFrameHost* new_host) {
-  render_frame_host_ = nullptr;
+  if (old_host == render_frame_host_)
+    render_frame_host_ = nullptr;

[Charlie Reis, 2016/07/01 21:50:18]

Seems right.  We should probably add a CleanUp call to both of these in a
separate CL to be consistent with the old behavior (from
https://codereview.chromium.org/2102883002/diff/80001/chrome/browser/file_sel...),
but let's not do that in this CL.

 }
 
 void FileSelectHelper::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
-  render_frame_host_ = nullptr;
+  if (render_frame_host == render_frame_host_)
+    render_frame_host_ = nullptr;
 }
 
 void FileSelectHelper::WebContentsDestroyed() {
   render_frame_host_ = nullptr;
   web_contents_ = nullptr;
   CleanUp();
 }
 
 // static
 bool FileSelectHelper::IsAcceptTypeValid(const std::string& accept_type) {
@@ skipping 12 matching lines @@
 
 // static
 base::FilePath FileSelectHelper::GetSanitizedFileName(
     const base::FilePath& suggested_filename) {
   if (suggested_filename.empty())
     return base::FilePath();
   return net::GenerateFileName(
       GURL(), std::string(), std::string(), suggested_filename.AsUTF8Unsafe(),
       std::string(), l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
 }