Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1946)

Unified Diff: content/renderer/pepper/pepper_file_chooser_host_unittest.cc

Issue 12286020: Replace FilePath with base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_file_chooser_host.cc ('k') | content/renderer/pepper/pepper_file_io_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_file_chooser_host_unittest.cc
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 556f130dbaafe0832f9ca183e011cc8257973249..f49ab533034fd635c59c2df077239a8c6d089969 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -61,7 +61,7 @@ class PepperFileChooserHostTest : public RenderViewTest {
};
// For testing to convert our hardcoded file paths to 8-bit.
-std::string FilePathToUTF8(const FilePath::StringType& path) {
+std::string FilePathToUTF8(const base::FilePath::StringType& path) {
#if defined(OS_WIN)
return UTF16ToUTF8(path);
#else
@@ -107,7 +107,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
// path separator so we include both a Unix and a Windows one.
ui::SelectedFileInfo selected_info;
selected_info.display_name = FILE_PATH_LITERAL("Hello, world");
- selected_info.local_path = FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
+ selected_info.local_path = base::FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
std::vector<ui::SelectedFileInfo> selected_info_vector;
selected_info_vector.push_back(selected_info);
RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
« no previous file with comments | « content/renderer/pepper/pepper_file_chooser_host.cc ('k') | content/renderer/pepper/pepper_file_io_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698