media: Update CDM_USE_PLATFORM_SPECIFIC_PATH define in CdmPathsTest

Update the condition here to be consistent with cdm_paths.gni. Also
update the comments to make sure they keep consistent.

Bug: 1128458
Change-Id: I7580d30637f9aae2d856846d74e086c64a2f123d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417137Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808070}

media/cdm/cdm_paths_unittest.cc

@@ -12,11 +12,12 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Only verify platform specific path on some platforms.
+// Note: The condition list here must be consistent with condition on
+// "cdm_platform_specific_path" in cdm_paths.gni.
 // TODO(crbug.com/971433). Move the CDMs out of the install directory on
 // ChromeOS.
-#if (defined(OS_MAC) || defined(OS_WIN) ||          \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))) && \
-    (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
+#if (defined(OS_MAC) || defined(OS_WIN) || \
+     (defined(OS_LINUX) && !defined(OS_CHROMEOS)))
 #define CDM_USE_PLATFORM_SPECIFIC_PATH
 #endif
 

media/cdm/library_cdm/cdm_paths.gni

@@ -25,7 +25,10 @@ component_arch = "$current_cpu"
 
 # Enable platform specific paths. This is required when the CDMs are Chrome
 # components, but is optional for other platforms.
-# Note: |cdm_platform_specific_path| is exported as a BUILDFLAG to cdm_paths.cc.
+# Note:
+# - |cdm_platform_specific_path| is exported as a BUILDFLAG to cdm_paths.cc.
+# - When updating the condition here, also update the condition on the define
+#   of CDM_USE_PLATFORM_SPECIFIC_PATH in cdm_paths_unittest.cc.
 if (is_win || is_mac || is_desktop_linux) {
   cdm_platform_specific_path =
       "_platform_specific/$component_os" + "_" + "$component_arch"