Remove some uses of Append(FILE_PATH_LITERAL()) with AppendASCII().

This also removes an incorrect FILE_PATH_LITERAL(kParentDirectory).  They got lucky the macro doesn't do anything on Mac.

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


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

3 files changed, 15 insertions, 15 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index e76b288..e5cd2d4 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -235,7 +235,7 @@ void TestShell::InitLogging(bool suppress_error_dialogs,
     // We might have multiple test_shell processes going at once
     FilePath log_filename;
     PathService::Get(base::DIR_EXE, &log_filename);
-    log_filename = log_filename.Append(FILE_PATH_LITERAL("test_shell.log"));
+    log_filename = log_filename.AppendASCII("test_shell.log");
     logging::InitLogging(log_filename.value().c_str(),
                          destination,
                          logging::LOCK_LOG_FILE,
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index b1e8ac1..6dfcdd5 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -76,14 +76,14 @@ FilePath GetResourcesFilePath() {
   // We need to know if we're bundled or not to know which path to use.
   if (mac_util::AmIBundled()) {
     PathService::Get(base::DIR_EXE, &path);
-    path = path.Append(FILE_PATH_LITERAL(FilePath::kParentDirectory));
-    return path.Append(FILE_PATH_LITERAL("Resources"));
+    path = path.Append(FilePath::kParentDirectory);
+    return path.AppendASCII("Resources");
   } else {
     PathService::Get(base::DIR_SOURCE_ROOT, &path);
-    path = path.Append(FILE_PATH_LITERAL("webkit"));
-    path = path.Append(FILE_PATH_LITERAL("tools"));
-    path = path.Append(FILE_PATH_LITERAL("test_shell"));
-    return path.Append(FILE_PATH_LITERAL("resources"));
+    path = path.AppendASCII("webkit");
+    path = path.AppendASCII("tools");
+    path = path.AppendASCII("test_shell");
+    return path.AppendASCII("resources");
   }
 }
 
@@ -909,7 +909,7 @@ std::string GetDataResource(int resource_id) {
       // In order to match WebKit's colors for the missing image, we have to
       // use a PNG. The GIF doesn't have the color range needed to correctly
       // match the TIFF they use in Safari.
-      path = path.Append(FILE_PATH_LITERAL("missingImage.png"));
+      path = path.AppendASCII("missingImage.png");
       bool success = file_util::ReadFileToString(path.ToWStringHack(),
                                                  &broken_image_data);
       if (!success) {
@@ -929,7 +929,7 @@ std::string GetDataResource(int resource_id) {
     static std::string resize_corner_data;
     if (resize_corner_data.empty()) {
       FilePath path = GetResourcesFilePath();
-      path = path.Append(FILE_PATH_LITERAL("textAreaResizeCorner.png"));
+      path = path.AppendASCII("textAreaResizeCorner.png");
       bool success = file_util::ReadFileToString(path.ToWStringHack(),
                                                  &resize_corner_data);
       if (!success) {
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 1f880e8..2cce352 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -120,10 +120,10 @@ bool MinidumpCallback(const wchar_t *dumpPath,
 FilePath GetResourcesFilePath() {
   FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
-  path = path.Append(FILE_PATH_LITERAL("webkit"));
-  path = path.Append(FILE_PATH_LITERAL("tools"));
-  path = path.Append(FILE_PATH_LITERAL("test_shell"));
-  return path.Append(FILE_PATH_LITERAL("resources"));
+  path = path.AppendASCII("webkit");
+  path = path.AppendASCII("tools");
+  path = path.AppendASCII("test_shell");
+  return path.AppendASCII("resources");
 }
 
 StringPiece GetRawDataResource(HMODULE module, int resource_id) {
@@ -743,7 +743,7 @@ std::string GetDataResource(int resource_id) {
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
-      path = path.Append(FILE_PATH_LITERAL("missingImage.gif"));
+      path = path.AppendASCII("missingImage.gif");
       bool success = file_util::ReadFileToString(path.ToWStringHack(),
                                                  &broken_image_data);
       if (!success) {
@@ -763,7 +763,7 @@ std::string GetDataResource(int resource_id) {
     static std::string resize_corner_data;
     if (resize_corner_data.empty()) {
       FilePath path = GetResourcesFilePath();
-      path = path.Append(FILE_PATH_LITERAL("textAreaResizeCorner.png"));
+      path = path.AppendASCII("textAreaResizeCorner.png");
       bool success = file_util::ReadFileToString(path.ToWStringHack(),
                                                  &resize_corner_data);
       if (!success) {