Assign FILE_PATH_LITERALS to FilePath::CharType[] arrays.

Assign FILE_PATH_LITERALS to FilePath::CharType[] arrays.

Fixed a couple of places that assigned FILE_PATH_LITERALS to char[] arrays.

BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182466

[Joao da Silva, 2013-02-13 16:16:49]

I was asked to clean this up on another CL, please review. Thanks!

[jochen (gone - plz use gerrit), 2013-02-13 16:19:33]

lgtm

please add a BUG= line

[commit-bot: I haz the power, 2013-02-13 17:52:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/joaodasilva@chromium.org/12230014/1

[commit-bot: I haz the power, 2013-02-13 19:38:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/joaodasilva@chromium.org/12230014/1

[commit-bot: I haz the power, 2013-02-13 19:38:38]

Failed to apply patch for chrome/common/chrome_paths.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/common/chrome_paths.cc
  Hunk #2 FAILED at 93.
  Hunk #3 succeeded at 408 with fuzz 2 (offset 5 lines).
  Hunk #4 succeeded at 476 (offset 8 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/common/chrome_paths.cc.rej

Patch:       chrome/common/chrome_paths.cc
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index
baada98f3ae8421ea56dda17e8475d136c359fc9..929611d37389f51717c20ca8eb13c1e48b46537d
100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -84,7 +84,7 @@ const base::FilePath::CharType kGTalkPluginFileName[] =
 #if defined(OS_LINUX)
 // The path to the external extension <id>.json files.
 // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
-const char kFilepathSinglePrefExtensions[] =
+const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
 #if defined(GOOGLE_CHROME_BUILD)
     FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
 #else
@@ -93,7 +93,7 @@ const char kFilepathSinglePrefExtensions[] =
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_CHROMEOS)
-const char kDefaultAppOrderFileName[] =
+const base::FilePath::CharType kDefaultAppOrderFileName[] =
 #if defined(GOOGLE_CHROME_BUILD)
     FILE_PATH_LITERAL("/usr/share/google-chrome/default_app_order.json");
 #else
@@ -403,7 +403,7 @@ bool PathProvider(int key, base::FilePath* result) {
       cur = cur.Append(FILE_PATH_LITERAL("custom_wallpapers"));
       break;
     case chrome::FILE_DEFAULT_APP_ORDER:
-      cur = base::FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
+      cur = base::FilePath(kDefaultAppOrderFileName);
       break;
 #endif
     // The following are only valid in the development environment, and
@@ -468,7 +468,7 @@ bool PathProvider(int key, base::FilePath* result) {
 #endif
 #if defined(OS_LINUX)
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
-      cur = base::FilePath(FILE_PATH_LITERAL(kFilepathSinglePrefExtensions));
+      cur = base::FilePath(kFilepathSinglePrefExtensions);
       break;
     }
 #endif

[commit-bot: I haz the power, 2013-02-14 10:01:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/joaodasilva@chromium.org/12230014/2017

[commit-bot: I haz the power, 2013-02-14 15:00:48]

Change committed as 182466