Move RunFileChooserHelper and EnumerateDirectoryHelper out of Browser.

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2486 matching lines @@
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
     // with the NeedToFireBeforeUnload bit cleared.
     contents->GetRenderViewHost()->FirePageBeforeUnload(false);
     return true;
   }
   return false;
 }
 
 // static
-void Browser::RunFileChooserHelper(
-    WebContents* tab, const content::FileChooserParams& params) {
-  Profile* profile =
-      Profile::FromBrowserContext(tab->GetBrowserContext());
-  // FileSelectHelper adds a reference to itself and only releases it after
-  // sending the result message. It won't be destroyed when this reference
-  // goes out of scope.
-  scoped_refptr<FileSelectHelper> file_select_helper(
-      new FileSelectHelper(profile));
-  file_select_helper->RunFileChooser(tab->GetRenderViewHost(), tab, params);
-}
-
-// static
-void Browser::EnumerateDirectoryHelper(WebContents* tab, int request_id,
-                                       const FilePath& path) {
-  Profile* profile =
-      Profile::FromBrowserContext(tab->GetBrowserContext());
-  // FileSelectHelper adds a reference to itself and only releases it after
-  // sending the result message. It won't be destroyed when this reference
-  // goes out of scope.
-  scoped_refptr<FileSelectHelper> file_select_helper(
-      new FileSelectHelper(profile));
-  file_select_helper->EnumerateDirectory(request_id,
-                                         tab->GetRenderViewHost(),
-                                         path);
-}
-
-// static
 void Browser::JSOutOfMemoryHelper(WebContents* tab) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (!tcw)
     return;
 
   InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper();
   infobar_helper->AddInfoBar(new SimpleAlertInfoBarDelegate(
       infobar_helper,
       NULL,
@@ skipping 1337 matching lines @@
 #endif
   return color_chooser_.get();
 }
 
 void Browser::DidEndColorChooser() {
   color_chooser_.reset();
 }
 
 void Browser::RunFileChooser(WebContents* tab,
                              const content::FileChooserParams& params) {
-  RunFileChooserHelper(tab, params);
+  FileSelectHelper::RunFileChooser(tab, params);
 }
 
-void Browser::EnumerateDirectory(WebContents* tab, int request_id,
+void Browser::EnumerateDirectory(WebContents* tab,
+                                 int request_id,
                                  const FilePath& path) {
-  EnumerateDirectoryHelper(tab, request_id, path);
+  FileSelectHelper::EnumerateDirectory(tab, request_id, path);
 }
 
 void Browser::ToggleFullscreenModeForTab(WebContents* tab,
                                          bool enter_fullscreen) {
   fullscreen_controller_->ToggleFullscreenModeForTab(tab, enter_fullscreen);
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* tab) const {
   return fullscreen_controller_->IsFullscreenForTabOrPending(tab);
 }
@@ skipping 1517 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }