Replace cases of Append(FILE_PATH_LITERAL()) with AppendASCII("").

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

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

4 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/extensions/extension.cc b/chrome/browser/extensions/extension.cc
index d93cacd..e8d6513 100644
--- a/chrome/browser/extensions/extension.cc
+++ b/chrome/browser/extensions/extension.cc
@@ -7,8 +7,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 
-const FilePath::CharType* Extension::kManifestFilename =
-    FILE_PATH_LITERAL("manifest");
+const char Extension::kManifestFilename[] = "manifest";
 
 const wchar_t* Extension::kFormatVersionKey = L"format_version";
 const wchar_t* Extension::kIdKey = L"id";
diff --git a/chrome/browser/extensions/extension.h b/chrome/browser/extensions/extension.h
index 2b2f775..8a82547 100644
--- a/chrome/browser/extensions/extension.h
+++ b/chrome/browser/extensions/extension.h
@@ -22,7 +22,7 @@ class Extension {
   static const int kExpectedFormatVersion = 1;
 
   // The name of the manifest inside an extension.
-  static const FilePath::CharType* kManifestFilename;
+  static const char kManifestFilename[];
 
   // Keys used in JSON representation of extensions.
   static const wchar_t* kFormatVersionKey;
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index f38ff04..cbefb3f 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -80,7 +80,8 @@ bool ExtensionsServiceBackend::LoadExtensionsFromDirectory(
                                        file_util::FileEnumerator::DIRECTORIES);
   for (FilePath child_path = enumerator.Next(); !child_path.value().empty();
        child_path = enumerator.Next()) {
-    FilePath manifest_path = child_path.Append(Extension::kManifestFilename);
+    FilePath manifest_path =
+        child_path.AppendASCII(Extension::kManifestFilename);
     if (!file_util::PathExists(manifest_path)) {
       ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                Extension::kInvalidManifestError);
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index 4c11661..0fa1932 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -25,7 +25,7 @@ class UserScriptMasterTest : public testing::Test,
     // Name a subdirectory of the temp directory.
     FilePath tmp_dir;
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &tmp_dir));
-    script_dir_ = tmp_dir.Append(FILE_PATH_LITERAL("UserScriptTest"));
+    script_dir_ = tmp_dir.AppendASCII("UserScriptTest");
 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(script_dir_, true);
@@ -87,7 +87,7 @@ TEST_F(UserScriptMasterTest, NewScripts) {
   scoped_refptr<UserScriptMaster> master(
       new UserScriptMaster(MessageLoop::current(), script_dir_));
 
-  FilePath path = script_dir_.Append(FILE_PATH_LITERAL("script.user.js"));
+  FilePath path = script_dir_.AppendASCII("script.user.js");
 
   FILE* file = file_util::OpenFile(path, "w");
   const char content[] = "some content";
@@ -101,7 +101,7 @@ TEST_F(UserScriptMasterTest, NewScripts) {
 
 // Test that we get notified about scripts if they're already in the test dir.
 TEST_F(UserScriptMasterTest, ExistingScripts) {
-  FilePath path = script_dir_.Append(FILE_PATH_LITERAL("script.user.js"));
+  FilePath path = script_dir_.AppendASCII("script.user.js");
 
   FILE* file = file_util::OpenFile(path, "w");
   const char content[] = "some content";