Remove a is_nacl_nonsfi workaround in base/ that seems no longer necessary.

base is now a static_library in nacl_nonsfi mode, like it already was
everywhere else.

Also fix a warning instead of suppressing it in nacl sfi builds.

Bug: 570839
Change-Id: I5414e8a00c74a27edcffe7aa68c096d3486571bd
Reviewed-on: https://chromium-review.googlesource.com/c/1352335
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611444}

base/BUILD.gn

@@ -100,16 +100,6 @@ if (is_win) {
   }
 }
 
-if (is_nacl_nonsfi) {
-  # Must be in a config because of how GN orders flags (otherwise -Wall will
-  # appear after this, and turn it back on).
-  config("nacl_nonsfi_warnings") {
-    # file_util_posix.cc contains a function which is not
-    # being used by nacl_helper_nonsfi.
-    cflags = [ "-Wno-unused-function" ]
-  }
-}
-
 if (is_android) {
   config("android_system_libs") {
     libs = [
@@ -132,14 +122,6 @@ if (is_android) {
 # test code (test support and anything in the test directory) which should use
 # source_set as is recommended for GN targets).
 jumbo_component("base") {
-  if (is_nacl_nonsfi) {
-    # TODO(phosek) bug 570839: If field_trial.cc is in a static library,
-    # nacl_helper_nonsfi doesn't link properly on Linux in debug builds. The
-    # reasons for this seem to involve obscure toolchain bugs. This should be
-    # fixed and this target should always be a static_library in the
-    # non-component case.
-    static_component_type = "source_set"
-  }
   if (is_nacl || is_ios) {
     # Link errors related to malloc functions if libbase for nacl is
     # compiled with jumbo: https://crbug.com/775959.
@@ -1553,7 +1535,6 @@ jumbo_component("base") {
 
     if (is_nacl_nonsfi) {
       sources -= [ "rand_util_nacl.cc" ]
-      configs += [ ":nacl_nonsfi_warnings" ]
     } else {
       sources -= [
         "files/file_descriptor_watcher_posix.cc",

base/files/file_util_posix.cc

@@ -74,10 +74,12 @@ int CallStat(const char* path, stat_wrapper_t* sb) {
   ScopedBlockingCall scoped_blocking_call(BlockingType::MAY_BLOCK);
   return stat(path, sb);
 }
+#if !defined(OS_NACL_NONSFI)
 int CallLstat(const char* path, stat_wrapper_t* sb) {
   ScopedBlockingCall scoped_blocking_call(BlockingType::MAY_BLOCK);
   return lstat(path, sb);
 }
+#endif
 #else
 int CallStat(const char* path, stat_wrapper_t* sb) {
   ScopedBlockingCall scoped_blocking_call(BlockingType::MAY_BLOCK);