Fix to use FilePath in more unittests.

chrome/browser/printing/printing_layout_uitest.cc

 // Copyright (c) 2006-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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/simple_thread.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 #include "printing/image.h"
 #include "printing/printing_test.h"
 #include "printing/native_metafile.h"
 
 namespace {
 
 using printing::Image;
 
 const wchar_t* const kGenerateSwitch = L"print-layout-generate";
 const wchar_t kDocRoot[] = L"chrome/test/data";
 
 class PrintingLayoutTest : public PrintingTest<UITest> {
  public:
   PrintingLayoutTest() {
-    emf_path_ = browser_directory_.ToWStringHack();
-    file_util::AppendToPath(&emf_path_, L"metafile_dumps");
+    emf_path_ = browser_directory_;
+    emf_path_ = emf_path_.AppendASCII("metafile_dumps");
     launch_arguments_.AppendSwitchWithValue(L"debug-print",
-                                            L'"' + emf_path_ + L'"');
+                                            L'"' + emf_path_.value() + L'"');
     show_window_ = true;
   }
 
   virtual void SetUp() {
     // Make sure there is no left overs.
     CleanupDumpDirectory();
     UITest::SetUp();
   }
 
   virtual void TearDown() {
@@ skipping 105 matching lines @@
  private:
   // Verifies that there is one .emf and one .prn file in the dump directory.
   // Returns the path of the .emf file and deletes the .prn file.
   std::wstring ScanFiles(const std::wstring& verification_name) {
     // Try to 10 seconds.
     std::wstring emf_file;
     std::wstring prn_file;
     bool found_emf = false;
     bool found_prn = false;
     for (int i = 0; i < 100; ++i) {
-      file_util::FileEnumerator enumerator(
-          FilePath::FromWStringHack(emf_path()), false,
+      file_util::FileEnumerator enumerator(emf_path(), false,
           file_util::FileEnumerator::FILES);
       emf_file.clear();
       prn_file.clear();
       found_emf = false;
       found_prn = false;
       std::wstring file;
       while (!(file = enumerator.Next().ToWStringHack()).empty()) {
         std::wstring ext = file_util::GetFileExtensionFromPath(file);
         if (!_wcsicmp(ext.c_str(), L"emf")) {
           EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" <<
@@ skipping 20 matching lines @@
     }
     EXPECT_TRUE(found_emf) << ".PRN file is: " << prn_file;
     EXPECT_TRUE(found_prn) << ".EMF file is: " << emf_file;
     return emf_file;
   }
 
   static bool GenerateFiles() {
     return CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch);
   }
 
-  const std::wstring& emf_path() const { return emf_path_; }
+  const FilePath& emf_path() const { return emf_path_; }
 
-  std::wstring emf_path_;
+  FilePath emf_path_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PrintingLayoutTest);
+  DISALLOW_COPY_AND_ASSIGN(PrintingLayoutTest);
 };
 
 // Tests that don't need UI access.
 class PrintingLayoutTestHidden : public PrintingLayoutTest {
  public:
   PrintingLayoutTestHidden() {
     show_window_ = false;
   }
 };
 
@@ skipping 228 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = server->TestServerPage("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }