Sort Filename Constants

The filename constants were out of order potentially and inadvertently leading to duplication and/or errors.

BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10682008

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

2 files changed, 51 insertions, 47 deletions

diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 3a2fc34..52e5fd0 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -127,46 +127,41 @@ const FilePath::CharType kExtensionKeyFileExtension[] = FPL(".pem");
 const FilePath::CharType kAndroidCacheFilename[] = FPL("AndroidCache");
 #endif
 const FilePath::CharType kArchivedHistoryFilename[] = FPL("Archived History");
+const FilePath::CharType kBookmarksFileName[] = FPL("Bookmarks");
 const FilePath::CharType kCacheDirname[] = FPL("Cache");
+const FilePath::CharType kCookieFilename[] = FPL("Cookies");
 const FilePath::CharType kCRLSetFilename[] =
     FPL("Certificate Revocation Lists");
-const FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache");
-const FilePath::CharType kOffTheRecordMediaCacheDirname[] =
-    FPL("Incognito Media Cache");
-const FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak");
-const FilePath::CharType kCookieFilename[] = FPL("Cookies");
-const FilePath::CharType kOBCertFilename[] = FPL("Origin Bound Certs");
+const FilePath::CharType kCustomDictionaryFileName[] =
+    FPL("Custom Dictionary.txt");
 const FilePath::CharType kExtensionsCookieFilename[] = FPL("Extension Cookies");
-const FilePath::CharType kIsolatedAppStateDirname[] = FPL("Isolated Apps");
 const FilePath::CharType kFaviconsFilename[] = FPL("Favicons");
+const FilePath::CharType kHistoryBookmarksFileName[] =
+    FPL("Bookmarks From History");
 const FilePath::CharType kHistoryFilename[] = FPL("History");
+const FilePath::CharType kIsolatedAppStateDirname[] = FPL("Isolated Apps");
+const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
 const FilePath::CharType kLocalStateFilename[] = FPL("Local State");
+const FilePath::CharType kLoginDataFileName[] = FPL("Login Data");
+const FilePath::CharType kManagedModePolicyFilename[] =
+    FPL("Managed Mode Settings");
+const FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache");
+const FilePath::CharType kNewTabThumbnailsFilename[] = FPL("Top Thumbnails");
+const FilePath::CharType kOBCertFilename[] = FPL("Origin Bound Certs");
+const FilePath::CharType kOffTheRecordMediaCacheDirname[] =
+    FPL("Incognito Media Cache");
 const FilePath::CharType kPreferencesFilename[] = FPL("Preferences");
+const FilePath::CharType kReadmeFilename[] = FPL("README");
 const FilePath::CharType kSafeBrowsingBaseFilename[] = FPL("Safe Browsing");
+const FilePath::CharType kServiceStateFileName[] = FPL("Service State");
 const FilePath::CharType kSingletonCookieFilename[] = FPL("SingletonCookie");
-const FilePath::CharType kSingletonSocketFilename[] = FPL("SingletonSocket");
 const FilePath::CharType kSingletonLockFilename[] = FPL("SingletonLock");
+const FilePath::CharType kSingletonSocketFilename[] = FPL("SingletonSocket");
+const FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak");
 const FilePath::CharType kThumbnailsFilename[] = FPL("Thumbnails");
-const FilePath::CharType kNewTabThumbnailsFilename[] = FPL("Top Thumbnails");
 const FilePath::CharType kTopSitesFilename[] = FPL("Top Sites");
-const wchar_t kUserDataDirname[] = L"User Data";
-const FilePath::CharType kWebDataFilename[] = FPL("Web Data");
-const FilePath::CharType kBookmarksFileName[] = FPL("Bookmarks");
-const FilePath::CharType kHistoryBookmarksFileName[] =
-    FPL("Bookmarks From History");
-const FilePath::CharType kCustomDictionaryFileName[] =
-    FPL("Custom Dictionary.txt");
-const FilePath::CharType kLoginDataFileName[] = FPL("Login Data");
-const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
 const FilePath::CharType kWebAppDirname[] = FPL("Web Applications");
-const FilePath::CharType kServiceStateFileName[] = FPL("Service State");
-const FilePath::CharType kReadmeFilename[] = FPL("README");
-const FilePath::CharType kManagedModePolicyFilename[] =
-    FPL("Managed Mode Settings");
-
-#if defined(OS_CHROMEOS)
-const FilePath::CharType kGDataCacheDirname[] = FPL("GCache");
-#endif  // defined(OS_CHROMEOS)
+const FilePath::CharType kWebDataFilename[] = FPL("Web Data");
 
 // File name of the Pepper Flash plugin on different platforms.
 const FilePath::CharType kPepperFlashPluginFilename[] =
@@ -178,6 +173,13 @@ const FilePath::CharType kPepperFlashPluginFilename[] =
     FPL("libpepflashplayer.so");
 #endif
 
+// directory names
+const wchar_t kUserDataDirname[] = L"User Data";
+
+#if defined(OS_CHROMEOS)
+const FilePath::CharType kGDataCacheDirname[] = FPL("GCache");
+#endif  // defined(OS_CHROMEOS)
+
 // We don't enable record mode in the released product because users could
 // potentially be tricked into running a product in record mode without
 // knowing it.  Enable in debug builds.  Playback mode is allowed always,
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index d099ed7..08e779d 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -57,45 +57,47 @@ extern const FilePath::CharType kExtensionKeyFileExtension[];
 extern const FilePath::CharType kAndroidCacheFilename[];
 #endif
 extern const FilePath::CharType kArchivedHistoryFilename[];
+extern const FilePath::CharType kBookmarksFileName[];
 extern const FilePath::CharType kCacheDirname[];
-extern const FilePath::CharType kCRLSetFilename[];
-extern const FilePath::CharType kMediaCacheDirname[];
-extern const FilePath::CharType kOffTheRecordMediaCacheDirname[];
-extern const FilePath::CharType kThemePackFilename[];
 extern const FilePath::CharType kCookieFilename[];
-extern const FilePath::CharType kOBCertFilename[];
+extern const FilePath::CharType kCRLSetFilename[];
+extern const FilePath::CharType kCustomDictionaryFileName[];
 extern const FilePath::CharType kExtensionsCookieFilename[];
-extern const FilePath::CharType kIsolatedAppStateDirname[];
 extern const FilePath::CharType kFaviconsFilename[];
+extern const FilePath::CharType kHistoryBookmarksFileName[];
 extern const FilePath::CharType kHistoryFilename[];
+extern const FilePath::CharType kIsolatedAppStateDirname[];
+extern const FilePath::CharType kJumpListIconDirname[];
 extern const FilePath::CharType kLocalStateFilename[];
+extern const FilePath::CharType kLoginDataFileName[];
+extern const FilePath::CharType kManagedModePolicyFilename[];
+extern const FilePath::CharType kMediaCacheDirname[];
+extern const FilePath::CharType kNewTabThumbnailsFilename[];
+extern const FilePath::CharType kOBCertFilename[];
+extern const FilePath::CharType kOffTheRecordMediaCacheDirname[];
 extern const FilePath::CharType kPreferencesFilename[];
+extern const FilePath::CharType kReadmeFilename[];
 extern const FilePath::CharType kSafeBrowsingBaseFilename[];
+extern const FilePath::CharType kServiceStateFileName[];
 extern const FilePath::CharType kSingletonCookieFilename[];
-extern const FilePath::CharType kSingletonSocketFilename[];
 extern const FilePath::CharType kSingletonLockFilename[];
+extern const FilePath::CharType kSingletonSocketFilename[];
+extern const FilePath::CharType kThemePackFilename[];
 extern const FilePath::CharType kThumbnailsFilename[];
-extern const FilePath::CharType kNewTabThumbnailsFilename[];
 extern const FilePath::CharType kTopSitesFilename[];
-extern const wchar_t kUserDataDirname[];
-extern const FilePath::CharType kWebDataFilename[];
-extern const FilePath::CharType kBookmarksFileName[];
-extern const FilePath::CharType kHistoryBookmarksFileName[];
-extern const FilePath::CharType kCustomDictionaryFileName[];
-extern const FilePath::CharType kLoginDataFileName[];
-extern const FilePath::CharType kJumpListIconDirname[];
 extern const FilePath::CharType kWebAppDirname[];
-extern const FilePath::CharType kServiceStateFileName[];
-extern const FilePath::CharType kReadmeFilename[];
-extern const FilePath::CharType kManagedModePolicyFilename[];
+extern const FilePath::CharType kWebDataFilename[];
+
+// File name of the Pepper Flash plugin on different platforms.
+extern const FilePath::CharType kPepperFlashPluginFilename[];
+
+// directory names
+extern const wchar_t kUserDataDirname[];
 
 #if defined(OS_CHROMEOS)
 extern const FilePath::CharType kGDataCacheDirname[];
 #endif  // defined(OS_CHROMEOS)
 
-// File name of the Pepper Flash plugin on different platforms.
-extern const FilePath::CharType kPepperFlashPluginFilename[];
-
 extern const bool kRecordModeEnabled;
 
 // Most sequence numbers are used by a renderer when responding to a browser