Refactoring; switch the |filter| parameter into something that is more amenab...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1763 matching lines @@
       target_url_status_ = TARGET_PENDING;
     } else {
       Send(new ViewHostMsg_UpdateTargetURL(routing_id_, page_id_, url));
       target_url_ = url;
       target_url_status_ = TARGET_INFLIGHT;
     }
   }
 }
 
 void RenderView::RunFileChooser(bool multi_select,
-                                const std::wstring& title,
-                                const std::wstring& default_filename,
-                                const std::wstring& filter,
+                                const string16& title,
+                                const FilePath& default_filename,
                                 WebFileChooserCallback* file_chooser) {
   if (file_chooser_.get()) {
     // TODO(brettw): bug 1235154: This should be a synchronous message to deal
     // with the fact that web pages can programatically trigger this. With the
     // asnychronous messages, we can get an additional call when one is pending,
     // which this test is for. For now, we just ignore the additional file
     // chooser request. WebKit doesn't do anything to expect the callback, so
     // we can just ignore calling it.
     delete file_chooser;
     return;
   }
   file_chooser_.reset(file_chooser);
   Send(new ViewHostMsg_RunFileChooser(routing_id_, multi_select, title,
-                                      default_filename, filter));
+                                      default_filename));
 }
 
 void RenderView::AddMessageToConsole(WebView* webview,
                                      const std::wstring& message,
                                      unsigned int line_no,
                                      const std::wstring& source_id) {
   Send(new ViewHostMsg_AddMessageToConsole(routing_id_, message,
                                            static_cast<int32>(line_no),
                                            source_id));
 }
@@ skipping 1366 matching lines @@
           "Renderer.Other.StartToFinishDoc", start_to_finish_doc);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.FinishDocToFinish", finish_doc_to_finish);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.RequestToFinish", request_to_finish);
       UMA_HISTOGRAM_TIMES(
           "Renderer.Other.StartToFinish", start_to_finish);
       break;
   }
 }