Remove some unneeded uses of wstring.

The automation proxy launcher is only producing ASCII log messages, so
regular strings are fine. In the process, fix an unwanted & in one of
the log messages which causes a format string error.

The video capture test is generating a filename and should be using
FILE_PATH_LITERAL to get the right kind of string for the platform.


Review URL: http://codereview.chromium.org/7519028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96022 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 5 deletions

diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 9e54881..e80266a 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -48,11 +48,8 @@ class DumpVideo {
  public:
   DumpVideo() : expected_size_(0) {}
   void StartDump(int width, int height) {
-    // Create an FilePath that works on all platforms. There should
-    // be a better way.
-    FilePath file_name =
-        FilePath::FromWStringHack(StringPrintf(L"dump_w%d_h%d.yuv", width,
-                                               height));
+    FilePath file_name = FilePath(
+        StringPrintf(FILE_PATH_LITERAL("dump_w%d_h%d.yuv"), width, height));
     file_.reset(file_util::OpenFile(file_name, "wb"));
     expected_size_ = width * height * 3 / 2;
   }