Better code to determine the framework and helper app paths

chrome/common/chrome_constants.cc

 // Copyright (c) 2006-2008 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 "chrome/common/chrome_constants.h"
 
 #include "base/file_path.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ skipping 18 matching lines @@
 const wchar_t kHelperProcessExecutableName[] = L"chrome.exe";
 #elif defined(OS_LINUX)
 const wchar_t kBrowserProcessExecutableName[] = L"chrome";
 const wchar_t kHelperProcessExecutableName[] = L"chrome";
 #elif defined(OS_MACOSX)
 const wchar_t kBrowserProcessExecutableName[] = PRODUCT_STRING_W;
 const wchar_t kHelperProcessExecutableName[] = PRODUCT_STRING_W L" Helper";
 #endif  // OS_*
 #if defined(OS_WIN)
 const wchar_t kBrowserProcessExecutablePath[] = L"chrome.exe";
-const wchar_t kHelperProcessExecutablePath[] = L"chrome.exe";
+const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe");
 #elif defined(OS_LINUX)
 const wchar_t kBrowserProcessExecutablePath[] = L"chrome";
-const wchar_t kHelperProcessExecutablePath[] = L"chrome";
+const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");
 #elif defined(OS_MACOSX)
 const wchar_t kBrowserProcessExecutablePath[] =
     PRODUCT_STRING_W L".app/Contents/MacOS/" PRODUCT_STRING_W;
-const wchar_t kHelperProcessExecutablePath[] =
-    PRODUCT_STRING_W L" Helper.app/Contents/MacOS/" PRODUCT_STRING_W L" Helper";
+const FilePath::CharType kHelperProcessExecutablePath[] =
+    FPL(PRODUCT_STRING " Helper.app/Contents/MacOS/" PRODUCT_STRING " Helper");
 #endif  // OS_*
 #if defined(OS_MACOSX)
 const FilePath::CharType kFrameworkName[] =
-    PRODUCT_STRING " Framework.framework";
+    FPL(PRODUCT_STRING " Framework.framework");
 #endif  // OS_MACOSX
 #if defined(CHROME_FRAME_BUILD)
 const wchar_t kBrowserAppName[] = L"ChromeFrame";
 const char    kStatsFilename[] = "ChromeFrameStats2";
 #elif defined(GOOGLE_CHROME_BUILD)
 const wchar_t kBrowserAppName[] = L"Chrome";
 const char    kStatsFilename[] = "ChromeStats2";
 #else
 const wchar_t kBrowserAppName[] = L"Chromium";
 const char    kStatsFilename[] = "ChromiumStats2";
@@ skipping 51 matching lines @@
 // because it is useful for testing and not hazardous by itself.
 #ifndef NDEBUG
 const bool kRecordModeEnabled = true;
 #else
 const bool kRecordModeEnabled = false;
 #endif
 
 }  // namespace chrome
 
 #undef FPL