Cleanup: Remove deprecated version of file_util::AppendToPath().

chrome/browser/printing/printing_layout_uitest.cc

 // Copyright (c) 2012 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_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/simple_thread.h"
@@ skipping 41 matching lines @@
   // |verification_name|. Compares the saved printed job pixels with the test
   // data pixels and returns the percentage of different pixels; 0 for success,
   // [0, 100] for failure.
   double CompareWithResult(const std::wstring& verification_name) {
     FilePath test_result(ScanFiles(verification_name));
     if (test_result.value().empty()) {
       // 100% different, the print job buffer is not there.
       return 100.;
     }
 
-    std::wstring verification_file(test_data_directory_.value());
-    file_util::AppendToPath(&verification_file, L"printing");
-    file_util::AppendToPath(&verification_file, verification_name);
-    FilePath emf(verification_file + L".emf");
-    FilePath png(verification_file + L".png");
+    FilePath base_path(test_data_directory_.AppendASCII("printing"));
+    FilePath emf(base_path.Append(verification_name + L".emf"));
+    FilePath png(base_path.Append(verification_name + L".png"));
 
+    FilePath cleartype(base_path.Append(verification_name + L"_cleartype.png"));
     // Looks for Cleartype override.
-    if (file_util::PathExists(
-            FilePath::FromWStringHack(verification_file + L"_cleartype.png")) &&
-        IsClearTypeEnabled()) {
-      png = FilePath(verification_file + L"_cleartype.png");
-    }
+    if (file_util::PathExists(cleartype) && IsClearTypeEnabled())
+      png = cleartype;
 
     if (GenerateFiles()) {
       // Copy the .emf and generate an .png.
       file_util::CopyFile(test_result, emf);
       Image emf_content(emf);
       emf_content.SaveToPng(png);
       // Saving is always fine.
       return 0;
     } else {
       // File compare between test and result.
       Image emf_content(emf);
       Image test_content(test_result);
       Image png_content(png);
       double diff_emf = emf_content.PercentageDifferent(test_content);
 
       EXPECT_EQ(0., diff_emf) << WideToUTF8(verification_name) <<
           " original size:" << emf_content.size().ToString() <<
           " result size:" << test_content.size().ToString();
       if (diff_emf) {
         // Backup the result emf file.
-        file_util::CopyFile(test_result, FilePath(
-              verification_file + L"_failed.emf"));
+        FilePath failed(base_path.Append(verification_name + L"_failed.emf"));
+        file_util::CopyFile(test_result, failed);
       }
 
       // This verification is only to know that the EMF rendering stays
       // immutable.
       double diff_png = emf_content.PercentageDifferent(png_content);
       EXPECT_EQ(0., diff_png) << WideToUTF8(verification_name) <<
           " original size:" << emf_content.size().ToString() <<
           " result size:" << test_content.size().ToString();
       if (diff_png) {
         // Backup the rendered emf file to detect the rendering difference.
-        emf_content.SaveToPng(FilePath(verification_file + L"_rendering.png"));
+        FilePath rendering(
+            base_path.Append(verification_name + L"_rendering.png"));
+        emf_content.SaveToPng(rendering);
       }
       return std::max(diff_png, diff_emf);
     }
   }
 
   // Makes sure the directory exists and is empty.
   void CleanupDumpDirectory() {
     EXPECT_TRUE(file_util::DieFileDie(emf_path(), true));
     EXPECT_TRUE(file_util::CreateDirectory(emf_path()));
   }
@@ skipping 308 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = test_server.GetURL("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }