Change WebContentsDelegate::RunFileChooser to be frame based.

chrome/browser/file_select_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_FILE_SELECT_HELPER_H_
 #define CHROME_BROWSER_FILE_SELECT_HELPER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 30 matching lines @@
 // be destroyed on the UI thread. References to FileSelectHelper may be passed
 // on to other threads.
 class FileSelectHelper : public base::RefCountedThreadSafe<
                              FileSelectHelper,
                              content::BrowserThread::DeleteOnUIThread>,
                          public ui::SelectFileDialog::Listener,
                          public content::WebContentsObserver,
                          public content::NotificationObserver {
  public:
   // Show the file chooser dialog.
-  static void RunFileChooser(content::WebContents* tab,
+  static void RunFileChooser(content::RenderFrameHost* render_frame_host,
                              const content::FileChooserParams& params);
 
   // Enumerates all the files in directory.
   static void EnumerateDirectory(content::WebContents* tab,
                                  int request_id,
                                  const base::FilePath& path);
 
  private:
   friend class base::RefCountedThreadSafe<FileSelectHelper>;
   friend class base::DeleteHelper<FileSelectHelper>;
@@ skipping 20 matching lines @@
     void OnListDone(int error) override;
 
    private:
     // This FileSelectHelper owns this object.
     FileSelectHelper* parent_;
     int id_;
 
     DISALLOW_COPY_AND_ASSIGN(DirectoryListerDispatchDelegate);
   };
 
-  void RunFileChooser(content::RenderViewHost* render_view_host,
-                      content::WebContents* web_contents,
+  void RunFileChooser(content::RenderFrameHost* render_frame_host,
                       std::unique_ptr<content::FileChooserParams> params);
   void GetFileTypesOnFileThread(
       std::unique_ptr<content::FileChooserParams> params);
   void GetSanitizedFilenameOnUIThread(
       std::unique_ptr<content::FileChooserParams> params);
 #if defined(FULL_SAFE_BROWSING)
   void CheckDownloadRequestWithSafeBrowsing(
       const base::FilePath& default_path,
       std::unique_ptr<content::FileChooserParams> params);
   void ProceedWithSafeBrowsingVerdict(
@@ skipping 110 matching lines @@
   // filename.
   //
   // Otherwise, returns |suggested_path| with any invalid characters will be
   // replaced with a suitable replacement character.
   static base::FilePath GetSanitizedFileName(
       const base::FilePath& suggested_path);
 
   // Profile used to set/retrieve the last used directory.
   Profile* profile_;
 
-  // The RenderViewHost and WebContents for the page showing a file dialog
+  // The RenderFrameHost and WebContents for the page showing a file dialog
   // (may only be one such dialog).
-  content::RenderViewHost* render_view_host_;
+  content::RenderFrameHost* render_frame_host_;
   content::WebContents* web_contents_;
 
   // Dialog box used for choosing files to upload from file form fields.
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
   std::unique_ptr<ui::SelectFileDialog::FileTypeInfo> select_file_types_;
 
   // The type of file dialog last shown.
   ui::SelectFileDialog::Type dialog_type_;
 
   // The mode of file dialog last shown.
   content::FileChooserParams::Mode dialog_mode_;
 
   // Maintain a list of active directory enumerations.  These could come from
   // the file select dialog or from drag-and-drop of directories, so there could
   // be more than one going on at a time.
   struct ActiveDirectoryEnumeration;
   std::map<int, ActiveDirectoryEnumeration*> directory_enumerations_;
 
   // Registrar for notifications regarding our RenderViewHost.
   content::NotificationRegistrar notification_registrar_;
 
   // Temporary files only used on OSX. This class is responsible for deleting
   // these files when they are no longer needed.
   std::vector<base::FilePath> temporary_files_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSelectHelper);
 };
 
 #endif  // CHROME_BROWSER_FILE_SELECT_HELPER_H_