--- chrome/test/BUILD.gn.orig	2017-03-09 20:04:30 UTC
+++ chrome/test/BUILD.gn
@@ -193,7 +193,7 @@ static_library("test_support") {
     ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_bsd) {
     public_deps += [ "//crypto:platform" ]
   }
   if (is_mac) {
@@ -451,7 +451,7 @@ if (!is_android) {
       "$root_out_dir/test_page.css.mock-http-headers",
       "$root_out_dir/ui_test.pak",
     ]
-    if (is_linux || is_win) {
+    if (is_linux || is_bsd || is_win) {
       data += [
         "$root_out_dir/chrome_100_percent.pak",
         "$root_out_dir/chrome_200_percent.pak",
@@ -460,7 +460,7 @@ if (!is_android) {
         "$root_out_dir/resources.pak",
       ]
     }
-    if (is_linux) {
+    if (is_linux || is_bsd) {
       data += [ "$root_out_dir/libppapi_tests.so" ]
     }
 
@@ -577,7 +577,7 @@ if (!is_android) {
           "../browser/ui/views/payments/payment_request_interactive_uitest_base.h",
         ]
       }
-      if (is_linux) {
+      if (is_linux || is_bsd) {
         if (!is_chromeos) {
           # Desktop linux.
           sources -= [
@@ -2041,14 +2041,14 @@ test("browser_tests") {
         sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
         deps += [ "//chrome/browser/chromeos" ]
         data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
-      } else if (is_linux || is_win) {
+      } else if (is_linux || is_bsd || is_win) {
         sources += [
           "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc",
           "../browser/ui/views/ime/ime_window_browsertest.cc",
         ]
       }
 
-      if (is_win || is_linux) {
+      if (is_win || is_linux || is_bsd) {
         sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
         data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
       }
@@ -2060,7 +2060,7 @@ test("browser_tests") {
         configs +=
             [ "//build/config/win:default_large_module_incremental_linking" ]
       }
-      if (is_linux) {
+      if (is_linux || is_bsd) {
         data_deps += [ "//components/nacl/loader:nacl_helper" ]
 
         if (enable_nacl_nonsfi) {
@@ -2170,7 +2170,7 @@ test("browser_tests") {
       }
     }
 
-    if (is_linux && !is_component_build) {
+    if ((is_linux || is_bsd) && !is_component_build) {
       # Set rpath to find the CDM adapter even in a non-component build.
       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
     }
@@ -2391,7 +2391,7 @@ test("browser_tests") {
       if (toolkit_views) {
         sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
       }
-      if (is_win || is_linux) {
+      if (is_win || is_linux || is_bsd) {
         sources +=
             [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
       }
@@ -2568,7 +2568,7 @@ test("browser_tests") {
         "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
       ]
     }
-    if (is_mac || is_win || (is_linux && !is_chromeos)) {
+    if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) {
       sources += [
         # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
         "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
@@ -2746,7 +2746,7 @@ if (!is_android) {
       "$root_out_dir/pyproto/",
     ]
 
-    if (is_linux || is_win) {
+    if (is_linux || is_bsd || is_win) {
       data += [
         "$root_out_dir/chrome_100_percent.pak",
         "$root_out_dir/chrome_200_percent.pak",
@@ -3439,7 +3439,7 @@ test("unit_tests") {
       "$root_out_dir/resources.pak",
     ]
   }
-  if (is_linux || is_win) {
+  if (is_linux || is_bsd || is_win) {
     data += [ "$root_out_dir/chrome_200_percent.pak" ]
   }
   if (is_win) {
@@ -4177,7 +4177,7 @@ test("unit_tests") {
       "//ui/wm",
     ]
   }
-  if (!is_chromeos && is_linux) {
+  if (!is_chromeos && (is_linux || is_bsd)) {
     sources += [
       "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
       "../browser/shell_integration_linux_unittest.cc",
@@ -4197,7 +4197,7 @@ test("unit_tests") {
   if (use_gio) {
     deps += [ "//build/linux/libgio" ]
   }
-  if (!is_chromeos && !use_ozone && is_linux) {
+  if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) {
     deps += [ "//chrome/browser/ui/libgtkui" ]
   }
 
@@ -4456,18 +4456,18 @@ test("unit_tests") {
       "//components/os_crypt:gnome_keyring_direct",
     ]
   }
-  if (is_linux && !is_chromeos && !use_ozone) {
+  if ((is_linux || is_bsd) && !is_chromeos && !use_ozone) {
     sources +=
         [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
     deps += [ "//third_party/libsecret" ]
   }
-  if (is_linux && use_aura) {
+  if ((is_linux || is_bsd) && use_aura) {
     deps += [ "//ui/aura:test_support" ]
     if (use_dbus) {
       deps += [ "//dbus:test_support" ]
     }
   }
-  if (is_linux && is_chrome_branded && current_cpu == "x86") {
+  if ((is_linux || is_bsd)  && is_chrome_branded && current_cpu == "x86") {
     ldflags = [ "-Wl,--strip-debug" ]
   }
   if (is_mac) {
@@ -4956,7 +4956,7 @@ if (safe_browsing_mode == 1 && is_mac) {
   }
 }
 
-if (!is_android) {
+if (!is_android && !is_bsd) {
   # TODO(609855): Make this compile on Android and run on the bots.
   test("chrome_app_unittests") {
     sources = [
@@ -4982,7 +4982,7 @@ if (!is_android) {
   }
 }
 
-if (!is_android && !is_ios && !is_chromecast) {
+if (!is_android && !is_ios && !is_chromecast && !is_bsd) {
   test("performance_browser_tests") {
     sources = [
       "../app/chrome_version.rc.version",