commit 58e1907f053a429373d7a781ce4fbe6357d0ba99
author hidehiko <hidehiko@chromium.org> Thu Nov 06 08:51:52 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 17:54:04 2020 +0900
tree 451ece00ea60b27e1afdb1d2a1acc5f441064386
parent 0d654917c0bab98f088ec395337697354c5790c1

Non-SFI mode: Clean up macros of base/ and ipc/ libraries for nacl_helper_nonsfi.

Now, OS_NACL_SFI and OS_NACL_NONSFI are introduced to build/build_config.h, and these are preferred to __native_client_nonsfi__ and OS_NACL combination.

BUG=358465
TEST=Ran trybots.

Review URL: https://codereview.chromium.org/704513003

Cr-Commit-Position: refs/heads/master@{#302907}


CrOS-Libchrome-Original-Commit: 853d6084e2f55a046ca7e3cc0ec427a26587f938

base/message_loop/message_loop.cc

diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index f1d0d3b..01402d0 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -100,7 +100,7 @@
 
 #if defined(OS_IOS)
 typedef MessagePumpIOSForIO MessagePumpForIO;
-#elif defined(OS_NACL) && !defined(__native_client_nonsfi__)
+#elif defined(OS_NACL_SFI)
 typedef MessagePumpDefault MessagePumpForIO;
 #elif defined(OS_POSIX)
 typedef MessagePumpLibevent MessagePumpForIO;
@@ -676,7 +676,7 @@
 //------------------------------------------------------------------------------
 // MessageLoopForIO
 
-#if !defined(OS_NACL) || defined(__native_client_nonsfi__)
+#if !defined(OS_NACL_SFI)
 void MessageLoopForIO::AddIOObserver(
     MessageLoopForIO::IOObserver* io_observer) {
   ToPumpIO(pump_.get())->AddIOObserver(io_observer);
@@ -714,6 +714,6 @@
 }
 #endif
 
-#endif  // !defined(OS_NACL) || defined(__native_client_nonsfi__)
+#endif  // !defined(OS_NACL_SFI)
 
 }  // namespace base

base/message_loop/message_loop.h

diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index b781711..47df69a 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -596,7 +596,7 @@
     return loop && loop->type() == MessageLoop::TYPE_IO;
   }
 
-#if !defined(OS_NACL) || defined(__native_client_nonsfi__)
+#if !defined(OS_NACL_SFI)
 
 #if defined(OS_WIN)
   typedef MessagePumpForIO::IOHandler IOHandler;
@@ -642,7 +642,7 @@
                            FileDescriptorWatcher *controller,
                            Watcher *delegate);
 #endif  // defined(OS_IOS) || defined(OS_POSIX)
-#endif  // !defined(OS_NACL) || defined(__native_client_nonsfi__)
+#endif  // !defined(OS_NACL_SFI)
 };
 
 // Do not add any member variables to MessageLoopForIO!  This is important b/c