media: More cleanup in cdm_paths.*

media/cdm/cdm_paths.cc

 // Copyright 2016 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 "media/cdm/cdm_paths.h"
 
 #include <string>
 
 #include "build/build_config.h"
 
 namespace media {
 
 // Note: This file must be in sync with cdm_paths.{gypi|gni}
 // TODO(xhwang): Improve how we enable platform specific path. See
 // http://crbug.com/468584
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if (defined(OS_MACOSX) || defined(OS_WIN)) && \
+    (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
 #define CDM_USE_PLATFORM_SPECIFIC_PATH
 #endif
 
 #if defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
 
 // Special path used in chrome components.
 const char kPlatformSpecific[] = "_platform_specific";
 
 // Name of the component platform in the manifest.
 const char kComponentPlatform[] =
 #if defined(OS_MACOSX)
     "mac";
 #elif defined(OS_WIN)
     "win";
 #elif defined(OS_CHROMEOS)
-    "chromeos";
+    "cros";
 #elif defined(OS_LINUX)
     "linux";
 #else
     "unsupported_platform";
 #endif
 
 // Name of the component architecture in the manifest.
 const char kComponentArch[] =
 #if defined(ARCH_CPU_X86)
     "x86";
@@ skipping 16 matching lines @@
 
 #else  // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
 
 base::FilePath GetPlatformSpecificDirectory(const std::string& cdm_base_path) {
   return base::FilePath();
 }
 
 #endif  // defined(CDM_USE_PLATFORM_SPECIFIC_PATH)
 
 }  // namespace media