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

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

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
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 0afde5be3fdb652c275ef98232c15fa972bff889..9f4a758db3af4df38de25ec1ab152603e0e4c7f3 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -59,7 +59,7 @@ class PepperFileChooserHostTest : public RenderViewTest {
// For testing to convert our hardcoded file paths to 8-bit.
std::string FilePathToUTF8(const base::FilePath::StringType& path) {
#if defined(OS_WIN)
- return UTF16ToUTF8(path);
+ return base::UTF16ToUTF8(path);
#else
return path;
#endif
@@ -97,7 +97,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
// Basic validation of request.
EXPECT_EQ(FileChooserParams::Open, chooser_params.mode);
ASSERT_EQ(1u, chooser_params.accept_types.size());
- EXPECT_EQ(accept[0], UTF16ToUTF8(chooser_params.accept_types[0]));
+ EXPECT_EQ(accept[0], base::UTF16ToUTF8(chooser_params.accept_types[0]));
// Send a chooser reply to the render view. Note our reply path has to have a
// path separator so we include both a Unix and a Windows one.
« no previous file with comments | « content/renderer/pepper/pepper_file_chooser_host.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698