Change WebContentsDelegate::RunFileChooser to be frame based.

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 1804 matching lines @@
   EXPECT_TRUE(NavigateToURL(shell(), regular_page_url));
   EXPECT_FALSE(ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
       shell()->web_contents()->GetRenderProcessHost()->GetID()));
 }
 
 class FileChooserDelegate : public WebContentsDelegate {
  public:
   FileChooserDelegate(const base::FilePath& file)
       : file_(file), file_chosen_(false) {}
 
-  void RunFileChooser(WebContents* web_contents,
+  void RunFileChooser(RenderFrameHost* render_frame_host,
                       const FileChooserParams& params) override {
     // Send the selected file to the renderer process.
     FileChooserFileInfo file_info;
     file_info.file_path = file_;
     std::vector<FileChooserFileInfo> files;
     files.push_back(file_info);
-    web_contents->GetRenderViewHost()->FilesSelectedInChooser(
-        files, FileChooserParams::Open);
+    render_frame_host->FilesSelectedInChooser(files, FileChooserParams::Open);
 
     file_chosen_ = true;
   }
 
   bool file_chosen() { return file_chosen_; }
 
  private:
   base::FilePath file_;
   bool file_chosen_;
 };
@@ skipping 906 matching lines @@
   TestNavigationObserver commit_observer(web_contents);
   shell()->LoadURL(embedded_test_server()->GetURL("b.com", "/title1.html"));
   commit_observer.Wait();
   exit_observer.Wait();
 
   // Ensure the entry's title hasn't changed after the ignored commit.
   EXPECT_EQ(title, entry->GetTitle());
 }
 
 }  // namespace content