gn: Use a separate flag for enabling libgnome-keyring support.

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
+import("//components/os_crypt/features.gni")
 import("//testing/test.gni")
 import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 # This target exists to reference other test executables to bring these files
 # into the build.
 group("test") {
@@ skipping 2098 matching lines @@
       "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
       "../browser/signin/signin_manager_unittest.cc",
     ]
   }
   if (use_x11) {
     deps += [ "//ui/events/devices" ]
     data_deps += [ "//tools/xdisplaycheck" ]
   } else {
     sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
   }
-  if (is_desktop_linux && current_cpu == "x64") {
+  if (use_gnome_keyring && current_cpu == "x64") {
     # Only add this test for 64 bit builds because otherwise we need the 32
     # bit library on 64 bit systems when running this test.
     sources +=
         [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
     configs += [
       "//components/os_crypt:gnome_keyring",
       "//components/os_crypt:gnome_keyring_direct",
     ]
   }
   if (is_linux && !is_chromeos) {
@@ skipping 337 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }