Update the SODA component to be platform-specific.

This CL updates the SODA component to be platform-specific.

Bug: 1033227
Change-Id: I41bd61affc673b38d6029c83a3b7468121dc8c79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2348015Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#797361}

chrome/browser/component_updater/soda_component_installer.cc

@@ -36,9 +36,6 @@ static_assert(base::size(kSODAPublicKeySHA256) == crypto::kSHA256Length,
 
 const char kSODAManifestName[] = "SODA Library";
 
-constexpr base::FilePath::CharType kSodaBinaryRelativePath[] =
-    FILE_PATH_LITERAL("SODAFiles/libsoda.so");
-
 constexpr base::FilePath::CharType kSodaEnUsConfigFileRelativePath[] =
     FILE_PATH_LITERAL("SODAFiles/en_us/dictation.ascii_proto");
 
@@ -129,7 +126,7 @@ void UpdateSODAInstallDirPref(PrefService* prefs,
                               const base::FilePath& install_dir) {
 #if !defined(OS_ANDROID)
   prefs->SetFilePath(prefs::kSodaBinaryPath,
-                     install_dir.Append(kSodaBinaryRelativePath));
+                     install_dir.Append(speech::kSodaBinaryRelativePath));
   prefs->SetFilePath(prefs::kSodaEnUsConfigPath,
                      install_dir.Append(kSodaEnUsConfigFileRelativePath));
 #endif

components/soda/constants.cc

@@ -11,14 +11,16 @@
 
 namespace speech {
 
-constexpr base::FilePath::CharType kSodaInstallationRelativePath[] =
-    FILE_PATH_LITERAL("SODA");
-
+#ifdef OS_WIN
+constexpr base::FilePath::CharType kSodaBinaryRelativePath[] =
+    FILE_PATH_LITERAL("SODAFiles/SODA.dll");
+#else
 constexpr base::FilePath::CharType kSodaBinaryRelativePath[] =
     FILE_PATH_LITERAL("SODAFiles/libsoda.so");
+#endif
 
-constexpr base::FilePath::CharType kSodaEnUsConfigFileRelativePath[] =
-    FILE_PATH_LITERAL("SODAFiles/en_us/dictation.ascii_proto");
+constexpr base::FilePath::CharType kSodaInstallationRelativePath[] =
+    FILE_PATH_LITERAL("SODA");
 
 const base::FilePath GetSodaDirectory() {
   base::FilePath components_dir;
@@ -49,10 +51,4 @@ const base::FilePath GetSodaBinaryPath() {
                           : soda_dir.Append(kSodaBinaryRelativePath);
 }
 
-const base::FilePath GetSodaConfigPath() {
-  base::FilePath soda_dir = GetLatestSodaDirectory();
-  return soda_dir.empty() ? base::FilePath()
-                          : soda_dir.Append(kSodaEnUsConfigFileRelativePath);
-}
-
 }  // namespace speech

components/soda/constants.h

@@ -33,10 +33,6 @@ const base::FilePath GetLatestSodaDirectory();
 // installed.
 const base::FilePath GetSodaBinaryPath();
 
-// Get the path to the dictation.ascii_proto config file used by SODA. Returns
-// an empty path if SODA is not installed.
-const base::FilePath GetSodaConfigPath();
-
 }  // namespace speech
 
 #endif  // COMPONENTS_SODA_CONSTANTS_H_